diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/concurrent/concurrent.pro | 3 | ||||
| -rw-r--r-- | src/opengl/opengl.pro | 3 | ||||
| -rw-r--r-- | src/openglextensions/openglextensions.pro | 3 | ||||
| -rw-r--r-- | src/printsupport/printsupport.pro | 2 | ||||
| -rw-r--r-- | src/testlib/testlib.pro | 1 | ||||
| -rw-r--r-- | src/xml/xml.pro | 3 |
6 files changed, 10 insertions, 5 deletions
diff --git a/src/concurrent/concurrent.pro b/src/concurrent/concurrent.pro index 2a519314f3..fd15a3c758 100644 --- a/src/concurrent/concurrent.pro +++ b/src/concurrent/concurrent.pro @@ -2,7 +2,8 @@ TARGET = QtConcurrent QT = core-private CONFIG += exceptions -DEFINES += QT_NO_USING_NAMESPACE +DEFINES += QT_NO_USING_NAMESPACE QT_NO_FOREACH + win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000 QMAKE_DOCS = $$PWD/doc/qtconcurrent.qdocconf diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro index 007f73c45f..2386ef5d19 100644 --- a/src/opengl/opengl.pro +++ b/src/opengl/opengl.pro @@ -1,7 +1,8 @@ TARGET = QtOpenGL QT = core-private gui-private widgets-private -DEFINES += QT_NO_USING_NAMESPACE +DEFINES += QT_NO_USING_NAMESPACE QT_NO_FOREACH + win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x63000000 solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2 irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused diff --git a/src/openglextensions/openglextensions.pro b/src/openglextensions/openglextensions.pro index 18eec27e1c..04a871114b 100644 --- a/src/openglextensions/openglextensions.pro +++ b/src/openglextensions/openglextensions.pro @@ -4,7 +4,8 @@ CONFIG += static contains(QT_CONFIG, opengl):CONFIG += opengl contains(QT_CONFIG, opengles2):CONFIG += opengles2 -DEFINES += QT_NO_CAST_FROM_ASCII +DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_FOREACH + PRECOMPILED_HEADER = HEADERS = qopenglextensions.h diff --git a/src/printsupport/printsupport.pro b/src/printsupport/printsupport.pro index 52eab672d3..52e99803c3 100644 --- a/src/printsupport/printsupport.pro +++ b/src/printsupport/printsupport.pro @@ -1,7 +1,7 @@ TARGET = QtPrintSupport QT = core-private gui-private widgets-private -DEFINES += QT_NO_USING_NAMESPACE +DEFINES += QT_NO_USING_NAMESPACE QT_NO_FOREACH QMAKE_DOCS = $$PWD/doc/qtprintsupport.qdocconf diff --git a/src/testlib/testlib.pro b/src/testlib/testlib.pro index 85fb0cd2fe..372a69c3ed 100644 --- a/src/testlib/testlib.pro +++ b/src/testlib/testlib.pro @@ -64,6 +64,7 @@ SOURCES = qtestcase.cpp \ DEFINES *= QT_NO_CAST_TO_ASCII \ QT_NO_CAST_FROM_ASCII \ + QT_NO_FOREACH \ QT_NO_DATASTREAM embedded:QMAKE_CXXFLAGS += -fno-rtti wince: LIBS += \ diff --git a/src/xml/xml.pro b/src/xml/xml.pro index f281e35444..cf9feda9bc 100644 --- a/src/xml/xml.pro +++ b/src/xml/xml.pro @@ -1,7 +1,8 @@ TARGET = QtXml QT = core-private -DEFINES += QT_NO_USING_NAMESPACE +DEFINES += QT_NO_USING_NAMESPACE QT_NO_FOREACH + win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x61000000 QMAKE_DOCS = $$PWD/doc/qtxml.qdocconf |