diff options
Diffstat (limited to 'mkspecs/features/qt.prf')
| -rw-r--r-- | mkspecs/features/qt.prf | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index 8af10b143d..03e58b3afd 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -2,15 +2,19 @@ CONFIG *= thread #handle defines win32 { - qt_static:DEFINES += QT_NODLL - !contains(DEFINES, QT_NODLL) { - QT_ENV_DLL = $$(QT_DLL) - QT_ENV_NO_DLL = $$(QT_NODLL) - isEmpty(QT_ENV_NO_DLL) { - shared|!isEmpty(QT_ENV_DLL):DEFINES += QT_DLL - } - contains(DEFINES, QT_MAKEDLL)|contains(DEFINES, QT_DLL):QMAKE_QT_DLL = 1 + # ### QT_NODLL and QT_DLL are compatibility, remove before the Qt 5.0 release + contains(QT_CONFIG, shared) { + DEFINES += QT_DLL + + # this variable is read by qmake in qmake/generators/win32/msvc_vcproj.cpp + # function VcprojGenerator::initDeploymentTool(), which contains some hardcoded + # library names (the ones that were static in Qt 4) + # it probably doesn't work anymore and should not be in this file + QMAKE_QT_DLL = 1 + } else { + DEFINES += QT_NODLL } + # Some files include qplatformdefs.h, which lives in the individual mkspec directory # However, if QMAKESPEC_ORIGINAL is set, the module/app is outside of the QtBase # directory, and using the default profile. So we add the original mkspecs directory |