summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-02-09 17:40:26 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-03-20 10:56:35 (GMT)
commitc251bc2a259f6ac2688f669bffd768fc546a45a1 (patch)
treea70b8bb176bb911e7275cbd15f9c97480edef5fb
parentc146c321b0360dfa6a320e6849f74f56ad2f6f46 (diff)
downloadQt-c251bc2a259f6ac2688f669bffd768fc546a45a1.zip
Qt-c251bc2a259f6ac2688f669bffd768fc546a45a1.tar.gz
Qt-c251bc2a259f6ac2688f669bffd768fc546a45a1.tar.bz2
build with QT_NO_GEOM_VARIANT
saves us some pointless code Change-Id: I24e4fe4107f44ab579c0f951551c4138713a749f Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> (cherry picked from commit 2091d4c33a0f20e44f64ecf9953bb7725ceed287)
-rw-r--r--tools/configure/configure.pro6
1 files changed, 1 insertions, 5 deletions
diff --git a/tools/configure/configure.pro b/tools/configure/configure.pro
index c2f1b65..6c93fe7 100644
--- a/tools/configure/configure.pro
+++ b/tools/configure/configure.pro
@@ -3,7 +3,7 @@ DESTDIR = $$PWD/../.. # build directly in source dir
CONFIG += console flat
CONFIG -= moc qt
-DEFINES = UNICODE QT_NODLL QT_NO_CODECS QT_NO_TEXTCODEC QT_NO_UNICODETABLES QT_LITE_COMPONENT QT_NO_STL QT_NO_COMPRESS QT_NO_THREAD QT_NO_QOBJECT _CRT_SECURE_NO_DEPRECATE
+DEFINES = UNICODE QT_NODLL QT_NO_CODECS QT_NO_TEXTCODEC QT_NO_UNICODETABLES QT_LITE_COMPONENT QT_NO_STL QT_NO_COMPRESS QT_NO_THREAD QT_NO_QOBJECT QT_NO_GEOM_VARIANT _CRT_SECURE_NO_DEPRECATE
DEFINES += QT_BOOTSTRAPPED
win32 : LIBS += -lole32 -ladvapi32
@@ -116,10 +116,6 @@ SOURCES = main.cpp configureapp.cpp environment.cpp tools.cpp \
$$QT_SOURCE_TREE/src/corelib/kernel/qvariant.cpp \
$$QT_SOURCE_TREE/src/corelib/kernel/qsystemerror.cpp \
$$QT_SOURCE_TREE/src/corelib/io/qurl.cpp \
- $$QT_SOURCE_TREE/src/corelib/tools/qline.cpp \
- $$QT_SOURCE_TREE/src/corelib/tools/qsize.cpp \
- $$QT_SOURCE_TREE/src/corelib/tools/qpoint.cpp \
- $$QT_SOURCE_TREE/src/corelib/tools/qrect.cpp \
$$QT_SOURCE_TREE/src/corelib/kernel/qmetatype.cpp \
$$QT_SOURCE_TREE/src/corelib/global/qmalloc.cpp \
$$QT_SOURCE_TREE/src/corelib/xml/qxmlstream.cpp \