From f245fc543c479cbc69be886c5d04d4738b491060 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 17 Aug 2015 17:08:26 +0200 Subject: 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 --- src/qmldevtools/qtqmldevtoolsglobal_p.h | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'src/qmldevtools') diff --git a/src/qmldevtools/qtqmldevtoolsglobal_p.h b/src/qmldevtools/qtqmldevtoolsglobal_p.h index fa8731deb6..5cbb5ece72 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 -- cgit v1.2.3