summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@nokia.com>2011-08-11 15:13:48 +0200
committerAndy Nichols <janichol@codereview.qt.nokia.com>2011-08-11 15:20:17 +0200
commitd34b0eb633d142fc58f4aaf93afef6516acb9314 (patch)
treeb95e7cdc7e707634bdf5e789f32581959722702f
parentcbce0088bbb41b14d8ec41874d94e75283876e72 (diff)
Fix platformsupport as installable module
Change-Id: I17c4723c551c1cee9c442e8d6c1289bccf505d3d Reviewed-on: http://codereview.qt.nokia.com/2868 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Andy Nichols
-rw-r--r--src/modules/qt_platformsupport.pri1
-rw-r--r--src/platformsupport/platformsupport.pro6
2 files changed, 5 insertions, 2 deletions
diff --git a/src/modules/qt_platformsupport.pri b/src/modules/qt_platformsupport.pri
index 199beaf563..152f69b3e9 100644
--- a/src/modules/qt_platformsupport.pri
+++ b/src/modules/qt_platformsupport.pri
@@ -4,6 +4,7 @@ QT.platformsupport.MINOR_VERSION = 0
QT.platformsupport.PATCH_VERSION = 0
QT.platformsupport.name = QtPlatformSupport
+QT.platformsupport.bins = $$QT_MODULE_BIN_BASE
QT.platformsupport.includes = $$QT_MODULE_INCLUDE_BASE/QtPlatformSupport
QT.platformsupport.private_includes = $$QT_MODULE_INCLUDE_BASE/QtPlatformSupport/$$QT.platformsupport.VERSION
QT.platformsupport.sources = $$QT_MODULE_BASE/src/platformsupport
diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro
index 5609996d8d..f5e62ef925 100644
--- a/src/platformsupport/platformsupport.pro
+++ b/src/platformsupport/platformsupport.pro
@@ -1,5 +1,5 @@
load(qt_module)
-TARGET = $$qtLibraryTarget(QtPlatformSupport)
+TARGET = QtPlatformSupport
QPRO_PWD = $$PWD
QT += core-private gui-private
TEMPLATE = lib
@@ -9,7 +9,9 @@ CONFIG += module
!mac:CONFIG += staticlib
mac:LIBS += -lz -framework CoreFoundation -framework Carbon
-MODULE_PRI = ../modules/qt_platformssupport.pri
+MODULE_PRI = ../modules/qt_platformsupport.pri
+
+load(qt_module_config)
unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui