summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorStephen Kelly <stephen.kelly@kdab.com>2012-12-07 12:39:12 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-12-11 13:37:57 +0100
commit1278b3cb8a2ca926ffb2a0919d8646d0f5d9f320 (patch)
tree6ac14b4ba5f96ebbe90057f20b6d7af19b18ab56 /mkspecs
parent3e7e61f856c265504ded63f777f1df111a78269d (diff)
Remove QT_DLL and QT_NODLL defines.
Task-number: QTBUG-28044 Change-Id: Ib8c4e1e8e52703aa6590875c34f05b6bc71db808 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/qt.prf5
1 files changed, 0 insertions, 5 deletions
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
index 0735ec465c..30bbae7c64 100644
--- a/mkspecs/features/qt.prf
+++ b/mkspecs/features/qt.prf
@@ -2,17 +2,12 @@ CONFIG *= thread
#handle defines
win32 {
- # ### 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
}
}
CONFIG(release, debug|release):DEFINES += QT_NO_DEBUG