diff options
| author | Carlos Manuel Duclos Vergara <carlos.duclos@nokia.com> | 2009-12-21 11:03:44 (GMT) |
|---|---|---|
| committer | Carlos Manuel Duclos Vergara <carlos.duclos@nokia.com> | 2009-12-21 12:46:39 (GMT) |
| commit | cba4d931bec2cb910e4dc149e0bc5d441cd64511 (patch) | |
| tree | f5eaff48fe32c02867c3f9e8f77d243cf2d29e4e /src/xmlpatterns/xmlpatterns.pro | |
| parent | da46da0a33c883f6cdcc155e137a9dc75f68b8fe (diff) | |
| download | Qt-cba4d931bec2cb910e4dc149e0bc5d441cd64511.zip Qt-cba4d931bec2cb910e4dc149e0bc5d441cd64511.tar.gz Qt-cba4d931bec2cb910e4dc149e0bc5d441cd64511.tar.bz2 | |
Fixing a problem with xmlpatterns, where code from tools/xmlpatterns was being included by src/xmlpatterns.
Reviewed-by: Peter Hartmann
Diffstat (limited to 'src/xmlpatterns/xmlpatterns.pro')
| -rw-r--r-- | src/xmlpatterns/xmlpatterns.pro | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/src/xmlpatterns/xmlpatterns.pro b/src/xmlpatterns/xmlpatterns.pro index 1df497d..a224762 100644 --- a/src/xmlpatterns/xmlpatterns.pro +++ b/src/xmlpatterns/xmlpatterns.pro @@ -1,15 +1,14 @@ -TARGET = QtXmlPatterns -QPRO_PWD = $$PWD -QT = core network -DEFINES += QT_BUILD_XMLPATTERNS_LIB QT_NO_USING_NAMESPACE +TARGET = QtXmlPatterns +QPRO_PWD = $$PWD +QT = core \ + network +DEFINES += QT_BUILD_XMLPATTERNS_LIB \ + QT_NO_USING_NAMESPACE win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x61000000 - -unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtNetwork - +unix:QMAKE_PKGCONFIG_REQUIRES = QtCore \ + QtNetwork include(../qbase.pri) - PRECOMPILED_HEADER = ../corelib/global/qt_pch.h - include($$PWD/common.pri) include($$PWD/acceltree/acceltree.pri) include($$PWD/api/api.pri) @@ -25,14 +24,13 @@ include($$PWD/schema/schema.pri) include($$PWD/type/type.pri) include($$PWD/utils/utils.pri) include($$PWD/qobjectmodel/qobjectmodel.pri, "", true) +wince*:# The Microsoft MIPS compiler crashes if /Og is specified +: -wince*: { - # The Microsoft MIPS compiler crashes if /Og is specified - # -O2/1 expands to /Og plus additional arguments. - contains(DEFINES, MIPS): { - QMAKE_CXXFLAGS_RELEASE ~= s/-O2/-Oi -Ot -Oy -Ob2/ - QMAKE_CXXFLAGS_RELEASE ~= s/-O1/-Os -Oy -Ob2/ - } +# -O2/1 expands to /Og plus additional arguments. +contains(DEFINES, MIPS): { + QMAKE_CXXFLAGS_RELEASE ~= s/-O2/-Oi -Ot -Oy -Ob2/ + QMAKE_CXXFLAGS_RELEASE ~= s/-O1/-Os -Oy -Ob2/ } - -symbian:TARGET.UID3=0x2001E62B +symbian:TARGET.UID3 = 0x2001E62B +HEADERS += |