diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-09-16 08:47:33 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-17 01:32:51 +0200 |
| commit | 81a5885814d9db2bf7968c749aeb9c6415784086 (patch) | |
| tree | 51f9396bb9467e39259265b9cc83b3129c4d21a0 /src/modules | |
| parent | fb59d866c25703f7c3c145f050a64c07600a3244 (diff) | |
Mac: fix linking with Qt frameworks which don't exist at qmake time
This restores the forced-vs-detection logic for Qt frameworks which
was removed by commit ceed409b40fd5b8fe5c62ac33144e66f50b28ede.
The problem of linking against Qt modules compiled as a static
library is solved a different way: the module must explicitly state
in the module .pri file that it is built as a static lib.
Change-Id: Ie3d726f7b3933e5b5d27f15c6112ec1c7dee1ea2
Reviewed-on: http://codereview.qt-project.org/5034
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/qt_platformsupport.pri | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/modules/qt_platformsupport.pri b/src/modules/qt_platformsupport.pri index 152f69b3e9..6671cc0584 100644 --- a/src/modules/qt_platformsupport.pri +++ b/src/modules/qt_platformsupport.pri @@ -12,4 +12,5 @@ QT.platformsupport.libs = $$QT_MODULE_LIB_BASE QT.platformsupport.plugins = $$QT_MODULE_PLUGIN_BASE QT.platformsupport.imports = $$QT_MODULE_IMPORT_BASE QT.platformsupport.depends = core gui +QT.platformsupport.module_config = staticlib QT.platformsupport.DEFINES = |