From 7395e6abc6bdea324acf178919500bf377073455 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 30 May 2012 13:03:56 +0200 Subject: 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 Reviewed-by: Oswald Buddenhagen --- qmake/Makefile.win32 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qmake/Makefile.win32') 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) -- cgit v1.2.3