summaryrefslogtreecommitdiffstats
path: root/qmake/qmake.pri
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2012-05-30 13:03:56 +0200
committerQt by Nokia <qt-info@nokia.com>2012-06-28 06:21:52 +0200
commit7395e6abc6bdea324acf178919500bf377073455 (patch)
treeb36804666e8960a0f3760a854bf7b81140fa3078 /qmake/qmake.pri
parent96166fa56abb52157387c4911efbd4e5e6beee93 (diff)
Clean up the use of QT_NODLL
QT_NODLL is replaced by QT_STATIC, but the latter is implied if QT_BOOTSTRAPPED is already defined. Therefore, simply remove the QT_NODLL definitions. Change-Id: Iac7ec0b494b7a78197c25d59547f45eaf92d7465 Reviewed-by: Mark Brand <mabrand@mabrand.nl> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'qmake/qmake.pri')
-rw-r--r--qmake/qmake.pri2
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/qmake.pri b/qmake/qmake.pri
index 68b78f8d21..bbeb899c80 100644
--- a/qmake/qmake.pri
+++ b/qmake/qmake.pri
@@ -33,7 +33,7 @@ contains(QT_EDITION, OpenSource) {
}
bootstrap { #Qt code
- DEFINES+=QT_NODLL QT_NO_THREAD
+ DEFINES+=QT_NO_THREAD
SOURCES+= \
qbitarray.cpp \
qbuffer.cpp \