Changeset 561 for trunk/src/xmlpatterns/xmlpatterns.pro

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/xmlpatterns/xmlpatterns.pro (modified) (2 diffs)

trunk/src/xmlpatterns/xmlpatterns.pro

@@ -1 @@
-TARGET     = QtXmlPatterns
+TARGET = QtXmlPatterns
 os2:TARGET_SHORT = QtXmlP
-QPRO_PWD   = $$PWD
-QT         = core network
-DEFINES   += QT_BUILD_XMLPATTERNS_LIB QT_NO_USING_NAMESPACE
+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)
@@ -23 +22 @@
 include($$PWD/parser/parser.pri)
 include($$PWD/projection/projection.pri)
+include($$PWD/schema/schema.pri)
 include($$PWD/type/type.pri)
 include($$PWD/utils/utils.pri)
-include($$PWD/qobjectmodel/qobjectmodel.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
+HEADERS +=