diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-08-17 17:08:26 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-08-18 11:13:44 +0000 |
| commit | f245fc543c479cbc69be886c5d04d4738b491060 (patch) | |
| tree | 68ab25fefd4ce18d56a412f5e55d630a8a5a61d1 /src/qmldevtools | |
| parent | 9c9fca5e27bd91da1ea07bebd7569049493c5ccf (diff) | |
| download | qtdeclarative-f245fc543c479cbc69be886c5d04d4738b491060.tar.gz qtdeclarative-f245fc543c479cbc69be886c5d04d4738b491060.tar.bz2 qtdeclarative-f245fc543c479cbc69be886c5d04d4738b491060.zip | |
QmlDevTools: Define QML export macros as empty.
Since QmlDevTools is a static library, no exports
(Q_QML_EXPORT/Q_QML_PRIVATE_EXPORT) should be specified.
Fixes link errors in qmlimportscanner and lupdate
with MSVC2015:
Qt5QmlDevToolsd.lib(qv4value.obj) : error LNK2019: unresolved external symbol "__declspec(dllimport) public: struct QV4::VTable * __cdecl QV4::Heap::Base::vtable(void)const " (__imp_?vtable@Base@Heap@QV4@@QEBAPEAUVTable@3@XZ) referenced in function "public: bool __cdecl QV4::Managed::isEqualTo(struct QV4::Managed const *)const " (?isEqualTo@Managed@QV4@@QEBA_NPEBU12@@Z)
D:\dev\5-vs15-56\qt-56\qtbase\bin\qmlimportscanner.exe : fatal error LNK1120: 1 unresolved externals
Change-Id: I6125b3d1eaacadba65a90047867779252dab6fbc
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/qmldevtools')
| -rw-r--r-- | src/qmldevtools/qtqmldevtoolsglobal_p.h | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/qmldevtools/qtqmldevtoolsglobal_p.h b/src/qmldevtools/qtqmldevtoolsglobal_p.h index fa8731deb..5cbb5ece7 100644 --- a/src/qmldevtools/qtqmldevtoolsglobal_p.h +++ b/src/qmldevtools/qtqmldevtoolsglobal_p.h @@ -49,21 +49,8 @@ QT_BEGIN_NAMESPACE -#ifndef QT_STATIC -# if defined(QT_BUILD_QML_LIB) -# define Q_QML_EXPORT Q_DECL_EXPORT -# else -# define Q_QML_EXPORT Q_DECL_IMPORT -# endif -#else -# define Q_QML_EXPORT -#endif - -#if defined(QT_BUILD_QMLDEVTOOLS_LIB) || defined(QT_QMLDEVTOOLS_LIB) -# define Q_QML_PRIVATE_EXPORT -#else -# define Q_QML_PRIVATE_EXPORT Q_QML_EXPORT -#endif +#define Q_QML_EXPORT +#define Q_QML_PRIVATE_EXPORT QT_END_NAMESPACE #endif // QTQMLGLOBAL_P_H |