diff options
Diffstat (limited to 'mkspecs/features')
-rw-r--r-- | mkspecs/features/default_post.prf | 7 | ||||
-rw-r--r-- | mkspecs/features/qml_plugin.prf | 6 | ||||
-rw-r--r-- | mkspecs/features/qt.prf | 2 | ||||
-rw-r--r-- | mkspecs/features/qt_module.prf | 2 | ||||
-rw-r--r-- | mkspecs/features/qt_plugin.prf | 2 |
5 files changed, 14 insertions, 5 deletions
diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf index 8e68b95dd5..bcaddc8363 100644 --- a/mkspecs/features/default_post.prf +++ b/mkspecs/features/default_post.prf @@ -62,8 +62,11 @@ debug { QMAKE_LIBFLAGS += $$QMAKE_LIBFLAGS_RELEASE } -use_gold_linker: QMAKE_LFLAGS += $$QMAKE_LFLAGS_USE_GOLD -enable_new_dtags: QMAKE_LFLAGS += $$QMAKE_LFLAGS_NEW_DTAGS +# disable special linker flags for host builds (no proper test for host support yet) +!host_build { + use_gold_linker: QMAKE_LFLAGS += $$QMAKE_LFLAGS_USE_GOLD + enable_new_dtags: QMAKE_LFLAGS += $$QMAKE_LFLAGS_NEW_DTAGS +} dll:win32: QMAKE_LFLAGS += $$QMAKE_LFLAGS_DLL static:mac: QMAKE_LFLAGS += $$QMAKE_LFLAGS_STATIC_LIB diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf index 5ae4c08227..a639ac2969 100644 --- a/mkspecs/features/qml_plugin.prf +++ b/mkspecs/features/qml_plugin.prf @@ -25,6 +25,12 @@ if(win32|mac):!macx-xcode { } isEmpty(TARGETPATH): TARGETPATH = $$eval(QT.$${CXX_MODULE}.name) +!no_cxx_module:win32:CONFIG(shared, static|shared) { + # Embed a VERSIONINFO resource into the plugin's DLL. + isEmpty(VERSION): VERSION = $$MODULE_VERSION + CONFIG += skip_target_version_ext +} + # Insert the plugins URI into its meta data to enable usage # of static plugins in QtDeclarative: URI = $$replace(TARGETPATH, "/", ".") diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index 264641b5b3..be54d030e7 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -67,7 +67,7 @@ qtAddModules(QT_PRIVATE, LIBS_PRIVATE) } qtAddRpathLink($$QT $$QT_PRIVATE) -wince*:static:gui { +wince:static:gui { QTLIB += qmenu_wce.res } diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index 5412f3778a..c89b6d2793 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -67,7 +67,7 @@ header_module { TEMPLATE = lib } DESTDIR = $$MODULE_BASE_OUTDIR/lib -win32:!wince*:!prefix_build: DLLDESTDIR = $$MODULE_BASE_OUTDIR/bin +win32:!wince:!prefix_build: DLLDESTDIR = $$MODULE_BASE_OUTDIR/bin CONFIG += qmake_cache target_qt diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf index 004eee551e..17748e518a 100644 --- a/mkspecs/features/qt_plugin.prf +++ b/mkspecs/features/qt_plugin.prf @@ -89,5 +89,5 @@ CONFIG += create_cmake load(qt_targets) load(qt_common) -wince*:LIBS += $$QMAKE_LIBS_GUI +wince: LIBS += $$QMAKE_LIBS_GUI QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF |