diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-11-05 11:40:27 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-11-05 11:43:52 +0200 |
| commit | f1a56f4db2f6d6c395ac6e7023b6e9184140d571 (patch) | |
| tree | a555f9978d66ecf76bc7c4e5245e4adaad66075e /tests | |
| parent | eda773316824cbb1aa7bdba402e568340b79b4f3 (diff) | |
Fixed symbian-abld build problems with xmlpatternsxqts
Qmake generators for symbian can't handle .depends for SUBDIRS values,
instead relying on the order of subdirs. Reordered the subdirs
as a hot fix to get test case to build before qmake can be properly
fixed.
Also removed duplicate inclusion of xmlpatterns.pri, which was causing
compile time warnings due to duplicate MACRO statements in mmps.
Reviewed-by: Janne Koskinen
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/xmlpatternsxqts/test/test.pro | 2 | ||||
| -rw-r--r-- | tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/tests/auto/xmlpatternsxqts/test/test.pro b/tests/auto/xmlpatternsxqts/test/test.pro index 603ae65b26..a69838af5e 100644 --- a/tests/auto/xmlpatternsxqts/test/test.pro +++ b/tests/auto/xmlpatternsxqts/test/test.pro @@ -24,5 +24,3 @@ win32 { else: DESTDIR = ../release } TARGET = tst_xmlpatternsxqts - -include (../../xmlpatterns.pri) diff --git a/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro b/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro index a3b13da9c4..39267c8de6 100644 --- a/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro +++ b/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro @@ -1,10 +1,10 @@ TEMPLATE = subdirs -SUBDIRS = test contains(QT_CONFIG,xmlpatterns) { SUBDIRS += lib !wince*:lib.file = lib/lib.pro test.depends = lib } +SUBDIRS += test # Needed on the win32-g++ setup and on the test machine arsia. INCLUDEPATH += $$QT_BUILD_TREE/include/QtXmlPatterns/private \ |