diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-08-10 11:47:28 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-08-10 11:47:28 (GMT) |
| commit | 0df5d5e4367a8052082897d02b4f00429d5cc4c1 (patch) | |
| tree | cc8a59f0e37dbd618270bbca5b644fc3b775d60a /src/xmlpatterns | |
| parent | f61ec84fc296c6f70011e30788ee511d6b6a18c6 (diff) | |
| parent | 17bffacda99055831bb4c8c6e7da39ec15415519 (diff) | |
| download | Qt-0df5d5e4367a8052082897d02b4f00429d5cc4c1.zip Qt-0df5d5e4367a8052082897d02b4f00429d5cc4c1.tar.gz Qt-0df5d5e4367a8052082897d02b4f00429d5cc4c1.tar.bz2 | |
Merge commit 'qt/master'
Diffstat (limited to 'src/xmlpatterns')
| -rw-r--r-- | src/xmlpatterns/query.pri | 2 | ||||
| -rw-r--r-- | src/xmlpatterns/xmlpatterns.pro | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/xmlpatterns/query.pri b/src/xmlpatterns/query.pri index e09a618..fab1940 100644 --- a/src/xmlpatterns/query.pri +++ b/src/xmlpatterns/query.pri @@ -11,4 +11,4 @@ include($$PWD/parser/parser.pri) include($$PWD/projection/projection.pri) include($$PWD/type/type.pri) include($$PWD/utils/utils.pri) -include($$PWD/qobjectmodel/qobjectmodel.pri) +include($$PWD/qobjectmodel/qobjectmodel.pri, "", true) diff --git a/src/xmlpatterns/xmlpatterns.pro b/src/xmlpatterns/xmlpatterns.pro index fb6aa1a..bb8e452 100644 --- a/src/xmlpatterns/xmlpatterns.pro +++ b/src/xmlpatterns/xmlpatterns.pro @@ -22,10 +22,9 @@ include($$PWD/janitors/janitors.pri) include($$PWD/parser/parser.pri) include($$PWD/projection/projection.pri) include($$PWD/schema/schema.pri) -include($$PWD/schematron/schematron.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 |