From 7e7a1eefb3797002e9b17314b6fa6896935ac6e4 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Wed, 14 Sep 2011 10:34:27 +1000 Subject: Windows: fixed compile of libQtPlatformSupport It is incorrect to use QT_GUI_EXPORT to export symbols from any library other than libQtGui. When used outside of libQtGui, QT_GUI_EXPORT attempts to _import_ symbols rather than _export_ them. Change-Id: I7489067f479edd3acd9bf08bcaa24ee4dea4c3cc Reviewed-on: http://codereview.qt-project.org/4838 Reviewed-by: Qt Sanity Bot Reviewed-by: Lincoln Ramsay --- src/platformsupport/eventdispatchers/qeventdispatcher_qpa_p.h | 2 +- src/platformsupport/inputcontext/qplatforminputcontextplugin_qpa_p.h | 2 +- src/platformsupport/platformsupport.pro | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src/platformsupport') diff --git a/src/platformsupport/eventdispatchers/qeventdispatcher_qpa_p.h b/src/platformsupport/eventdispatchers/qeventdispatcher_qpa_p.h index cb67701750..7aeb795742 100644 --- a/src/platformsupport/eventdispatchers/qeventdispatcher_qpa_p.h +++ b/src/platformsupport/eventdispatchers/qeventdispatcher_qpa_p.h @@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE class QEventDispatcherQPAPrivate; -class Q_GUI_EXPORT QEventDispatcherQPA : public QEventDispatcherUNIX +class Q_PLATFORMSUPPORT_EXPORT QEventDispatcherQPA : public QEventDispatcherUNIX { Q_OBJECT Q_DECLARE_PRIVATE(QEventDispatcherQPA) diff --git a/src/platformsupport/inputcontext/qplatforminputcontextplugin_qpa_p.h b/src/platformsupport/inputcontext/qplatforminputcontextplugin_qpa_p.h index 1dfb759682..ea9b10f66c 100644 --- a/src/platformsupport/inputcontext/qplatforminputcontextplugin_qpa_p.h +++ b/src/platformsupport/inputcontext/qplatforminputcontextplugin_qpa_p.h @@ -73,7 +73,7 @@ class QPlatformInputContext; Q_DECLARE_INTERFACE(QPlatformInputContextFactoryInterface, QPlatformInputContextFactoryInterface_iid) -class Q_GUI_EXPORT QPlatformInputContextPlugin : public QObject, public QPlatformInputContextFactoryInterface +class Q_PLATFORMSUPPORT_EXPORT QPlatformInputContextPlugin : public QObject, public QPlatformInputContextFactoryInterface { Q_OBJECT Q_INTERFACES(QPlatformInputContextFactoryInterface:QFactoryInterface) diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro index 9d6f8dcd41..b208e59f94 100644 --- a/src/platformsupport/platformsupport.pro +++ b/src/platformsupport/platformsupport.pro @@ -11,6 +11,8 @@ mac:LIBS += -lz -framework CoreFoundation -framework Carbon MODULE_PRI = ../modules/qt_platformsupport.pri +DEFINES += QT_BUILD_PLATFORMSUPPORT_LIB + load(qt_module_config) unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui -- cgit v1.2.3