feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlJSDebugger: Fix linkage error

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

Task-number: QTCREATORBUG-2609
This commit is contained in:
Kai Koehne
2010-10-05 16:21:24 +02:00
parent c1954e09fc
commit c6c2486d5d
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
share/qtcreator/qml/qmljsdebugger/include/qmljsdebugger_global.h
View File

@@ -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

3
share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebughelper_p.h
View File

@@ -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);

3
share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebugservice_p.h
View File

@@ -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)