QmlJSDebugger: Fix linkage error

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

Task-number: QTCREATORBUG-2609

diff --git a/share/qtcreator/qml/qmljsdebugger/include/qmljsdebugger_global.h b/share/qtcreator/qml/qmljsdebugger/include/qmljsdebugger_global.h
index 6aba5be..2ba7d08 100644 (file)
--- a/share/qtcreator/qml/qmljsdebugger/include/qmljsdebugger_global.h
+++ b/share/qtcreator/qml/qmljsdebugger/include/qmljsdebugger_global.h
@@ -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

diff --git a/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebughelper_p.h b/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebughelper_p.h
index c9cb839..d676ebc 100644 (file)
--- a/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebughelper_p.h
+++ b/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebughelper_p.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);

diff --git a/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebugservice_p.h b/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebugservice_p.h
index 0cadbe5..e6e7ffe 100644 (file)
--- a/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebugservice_p.h
+++ b/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebugservice_p.h
@@ -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)

diff --git a/share/qtcreator/qml/qmljsdebugger/qmljsdebugger-lib.pri b/share/qtcreator/qml/qmljsdebugger/qmljsdebugger-lib.pri
index ec99cd0..6abc94f 100644 (file)
--- a/share/qtcreator/qml/qmljsdebugger/qmljsdebugger-lib.pri
+++ b/share/qtcreator/qml/qmljsdebugger/qmljsdebugger-lib.pri
@@ -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