diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-05-30 13:03:56 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-28 06:21:52 +0200 |
| commit | 7395e6abc6bdea324acf178919500bf377073455 (patch) | |
| tree | b36804666e8960a0f3760a854bf7b81140fa3078 /qmake | |
| parent | 96166fa56abb52157387c4911efbd4e5e6beee93 (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')
| -rw-r--r-- | qmake/Makefile.win32 | 2 | ||||
| -rw-r--r-- | qmake/Makefile.win32-g++ | 2 | ||||
| -rw-r--r-- | qmake/qmake.pri | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index ad6d4448d7..b01e0e2c35 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -38,7 +38,7 @@ CFLAGS_BARE = -c -Fo./ \ -I$(BUILD_PATH)\src\corelib\global \ -I$(SOURCE_PATH)\mkspecs\$(QMAKESPEC) \ -I$(SOURCE_PATH)\tools\shared \ - -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT -DQT_NODLL \ + -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT \ -DQT_NO_COMPRESS -DUNICODE -DHAVE_QCONFIG_CPP -DQT_BUILD_QMAKE -DQT_NO_THREAD \ -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM -DQT_BOOTSTRAPPED CFLAGS = -Yuqmake_pch.h -FIqmake_pch.h -Fpqmake_pch.pch $(CFLAGS_BARE) $(CFLAGS) diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++ index d06d958ca3..d1cfcae374 100644 --- a/qmake/Makefile.win32-g++ +++ b/qmake/Makefile.win32-g++ @@ -49,7 +49,7 @@ CFLAGS = -c -o$@ -O \ -I$(SOURCE_PATH)/mkspecs/win32-g++ \ -I$(SOURCE_PATH)/tools/shared \ -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT \ - -DQT_NODLL -DQT_NO_COMPRESS -DUNICODE -DHAVE_QCONFIG_CPP \ + -DQT_NO_COMPRESS -DUNICODE -DHAVE_QCONFIG_CPP \ -DQT_BUILD_QMAKE -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM \ -DQT_BOOTSTRAPPED CXXFLAGS = $(CFLAGS) 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 \ |