diff options
Diffstat (limited to 'mkspecs/features/qt_module_config.prf')
| -rw-r--r-- | mkspecs/features/qt_module_config.prf | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/mkspecs/features/qt_module_config.prf b/mkspecs/features/qt_module_config.prf index 65c54f7a21..2046fc5eda 100644 --- a/mkspecs/features/qt_module_config.prf +++ b/mkspecs/features/qt_module_config.prf @@ -12,6 +12,16 @@ isEmpty(MODULE):MODULE = $$section($$list($$basename(_PRO_FILE_)), ., 0, 0) isEmpty(TARGET):error("You must set TARGET before include()'ing $${_FILE_}") isEmpty(VERSION):VERSION = $$QT_VERSION +# Compile as shared/DLL or static according to the option given to configure +# unless overridden +staticlib: CONFIG += static +!static:!shared { + contains(QT_CONFIG, static): \ + CONFIG += static + else: \ + CONFIG += shared +} + ucmodule = $$upper($$MODULE) MODULE_DEPENDS = $$replace(QT, -private$, ) @@ -48,9 +58,9 @@ MODULE_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules-inst/qt_$${MODULE}.pri } else { module_privdep = } - staticlib: \ + static: \ module_build_type = "QT.$${MODULE}.module_config = staticlib" - else:mac:!static:contains(QT_CONFIG, qt_framework): \ + else:mac:contains(QT_CONFIG, qt_framework): \ module_build_type = "QT.$${MODULE}.module_config = lib_bundle" else: \ module_build_type = @@ -157,8 +167,6 @@ mac { } } -win32:!shared:CONFIG += static - win32-borland { # Keep the size of the .tds file for the Qt library smaller than # 34 Mbytes to avoid linking problems @@ -166,8 +174,10 @@ win32-borland { QMAKE_CXXFLAGS_DEBUG += -vi -y- } +DEFINES += QT_BUILDING_QT win32 { INCLUDEPATH += tmp + # ### QT_MAKEDLL is compatibility, remove before the Qt 5.0 release !static: DEFINES+=QT_MAKEDLL } win32-borland:INCLUDEPATH += kernel @@ -177,8 +187,6 @@ aix-g++* { QMAKE_CXXFLAGS += -mminimal-toc } -!static:PRL_EXPORT_DEFINES += QT_SHARED - #install directives load(qt_installs) |