Skip to content
Snippets Groups Projects
Commit c6c2486d authored by Kai Koehne's avatar Kai Koehne
Browse files

QmlJSDebugger: Fix linkage error

Make sure that the private API used from Qt is compiled with
Q_DECL_IMPORT.

Task-number: QTCREATORBUG-2609
parent c1954e09
No related branches found
No related tags found
No related merge requests found
......@@ -34,10 +34,13 @@
# if defined(BUILD_QMLJSDEBUGGER_LIB)
# define QMLJSDEBUGGER_EXPORT Q_DECL_EXPORT
# define QMLJSDEBUGGER_EXTERN Q_DECL_IMPORT
# elif defined(BUILD_QMLJSDEBUGGER_STATIC_LIB)
# define QMLJSDEBUGGER_EXPORT
# define QMLJSDEBUGGER_EXTERN Q_DECL_IMPORT
# else
# define QMLJSDEBUGGER_EXPORT Q_DECL_IMPORT
# define QMLJSDEBUGGER_EXTERN Q_DECL_IMPORT
#endif
#endif // QMLJSDEBUGGER_GLOBAL_H
......@@ -42,6 +42,7 @@
#ifndef QDECLARATIVEDEBUGHELPER_P_H
#define QDECLARATIVEDEBUGHELPER_P_H
#include "../qmljsdebugger_global.h"
#include <QtCore/qglobal.h>
QT_BEGIN_HEADER
......@@ -53,7 +54,7 @@ class QDeclarativeEngine;
// Helper methods to access private API through a stable interface
// This is used in the qmljsdebugger library of QtCreator.
class Q_DECLARATIVE_EXPORT QDeclarativeDebugHelper
class QMLJSDEBUGGER_EXTERN QDeclarativeDebugHelper
{
public:
static QScriptEngine *getScriptEngine(QDeclarativeEngine *engine);
......
......@@ -42,6 +42,7 @@
#ifndef QDECLARATIVEDEBUGSERVICE_H
#define QDECLARATIVEDEBUGSERVICE_H
#include "../qmljsdebugger_global.h"
#include <QtCore/qobject.h>
QT_BEGIN_HEADER
......@@ -51,7 +52,7 @@ QT_BEGIN_NAMESPACE
QT_MODULE(Declarative)
class QDeclarativeDebugServicePrivate;
class Q_DECLARATIVE_EXPORT QDeclarativeDebugService : public QObject
class QMLJSDEBUGGER_EXTERN QDeclarativeDebugService : public QObject
{
Q_OBJECT
Q_DECLARE_PRIVATE(QDeclarativeDebugService)
......
......@@ -11,9 +11,7 @@ contains(CONFIG, dll) {
## Input
HEADERS += \
include/jsdebuggeragent.h \
include/qmljsdebugger_global.h \
include/qt_private/qdeclarativedebughelper_p.h \
include/qt_private/qdeclarativedebugservice_p.h
include/qmljsdebugger_global.h
SOURCES += \
jsdebuggeragent.cpp
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment