From 011874da90e4b4116db8e679d65305377d1c7645 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 7 Jan 2011 13:47:49 +0100 Subject: [PATCH] Make auto test build --- qt3support/tests/auto/q3sqlcursor/q3sqlcursor.pro | 3 +++ .../tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp | 2 +- .../auto/q3sqlselectcursor/q3sqlselectcursor.pro | 2 ++ .../q3sqlselectcursor/tst_q3sqlselectcursor.cpp | 2 +- qtbase/tests/auto/auto.pro | 10 ---------- .../tests/auto/declarative/examples/examples.pro | 2 +- .../qdeclarativesqldatabase.pro | 2 +- .../qdeclarativeviewer/qdeclarativeviewer.pro | 2 +- qtphonon/tests/auto/auto.pro | 3 +++ .../qapplicationargumentparser.pro | 2 +- .../auto/xmlpatternsschema/xmlpatternsschema.pro | 4 +++- .../tests/auto/xmlpatternssdk/xmlpatternssdk.pro | 7 ++++--- 12 files changed, 21 insertions(+), 20 deletions(-) create mode 100644 qtphonon/tests/auto/auto.pro diff --git a/qt3support/tests/auto/q3sqlcursor/q3sqlcursor.pro b/qt3support/tests/auto/q3sqlcursor/q3sqlcursor.pro index 2d316fb..7da4f8b 100644 --- a/qt3support/tests/auto/q3sqlcursor/q3sqlcursor.pro +++ b/qt3support/tests/auto/q3sqlcursor/q3sqlcursor.pro @@ -1,5 +1,8 @@ load(qttest_p4) +load(qt_module) + SOURCES += tst_q3sqlcursor.cpp +INCLUDEPATH += $$QT_SOURCE_TREE/tests/auto QT += sql qt3support requires(contains(QT_CONFIG,qt3support)) diff --git a/qt3support/tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp b/qt3support/tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp index 6f3722d..7103fb5 100644 --- a/qt3support/tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp +++ b/qt3support/tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp @@ -46,7 +46,7 @@ #include #include -#include "../qsqldatabase/tst_databases.h" +#include "qsqldatabase/tst_databases.h" const QString qtest(qTableName( "qtest", __FILE__ )); diff --git a/qt3support/tests/auto/q3sqlselectcursor/q3sqlselectcursor.pro b/qt3support/tests/auto/q3sqlselectcursor/q3sqlselectcursor.pro index 59448eb..48d5bfe 100644 --- a/qt3support/tests/auto/q3sqlselectcursor/q3sqlselectcursor.pro +++ b/qt3support/tests/auto/q3sqlselectcursor/q3sqlselectcursor.pro @@ -1,5 +1,7 @@ load(qttest_p4) +load(qt_module) SOURCES += tst_q3sqlselectcursor.cpp +INCLUDEPATH += $$QT_SOURCE_TREE/tests/auto QT += sql qt3support requires(contains(QT_CONFIG,qt3support)) diff --git a/qt3support/tests/auto/q3sqlselectcursor/tst_q3sqlselectcursor.cpp b/qt3support/tests/auto/q3sqlselectcursor/tst_q3sqlselectcursor.cpp index a5eecde..2ac7e80 100644 --- a/qt3support/tests/auto/q3sqlselectcursor/tst_q3sqlselectcursor.cpp +++ b/qt3support/tests/auto/q3sqlselectcursor/tst_q3sqlselectcursor.cpp @@ -49,7 +49,7 @@ #define NODATABASE_SKIP "No database drivers are available in this Qt configuration" -#include "../qsqldatabase/tst_databases.h" +#include "qsqldatabase/tst_databases.h" //TESTED_FILES= diff --git a/qtbase/tests/auto/auto.pro b/qtbase/tests/auto/auto.pro index c677249..02e8b5b 100644 --- a/qtbase/tests/auto/auto.pro +++ b/qtbase/tests/auto/auto.pro @@ -9,15 +9,5 @@ SUBDIRS += \ other.pro !cross_compile: SUBDIRS += host.pro -contains(QT_CONFIG, qt3support):!wince*: SUBDIRS += qt3support.pro contains(QT_CONFIG, opengl): SUBDIRS += opengl.pro -contains(QT_CONFIG, xmlpatterns): SUBDIRS += xmlpatterns.pro unix:!embedded:contains(QT_CONFIG, dbus): SUBDIRS += dbus.pro -contains(QT_CONFIG, script): SUBDIRS += script.pro -contains(QT_CONFIG, webkit): SUBDIRS += webkit.pro -contains(QT_CONFIG, multimedia): SUBDIRS += multimedia.pro -contains(QT_CONFIG, phonon): SUBDIRS += phonon.pro -contains(QT_CONFIG, svg): SUBDIRS += svg.pro -contains(QT_CONFIG, declarative): SUBDIRS += declarative.pro -!symbian SUBDIRS += help.pro - diff --git a/qtdeclarative/tests/auto/declarative/examples/examples.pro b/qtdeclarative/tests/auto/declarative/examples/examples.pro index dafc146..fa632f03 100644 --- a/qtdeclarative/tests/auto/declarative/examples/examples.pro +++ b/qtdeclarative/tests/auto/declarative/examples/examples.pro @@ -4,7 +4,7 @@ macx:CONFIG -= app_bundle SOURCES += tst_examples.cpp -include(../../../../tools/qml/qml.pri) +include(../../../../tools/qmlviewer/qml.pri) include(../symbianlibs.pri) diff --git a/qtdeclarative/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro b/qtdeclarative/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro index 0d335a5..bce758a 100644 --- a/qtdeclarative/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro +++ b/qtdeclarative/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro @@ -1,6 +1,6 @@ load(qttest_p4) contains(QT_CONFIG,declarative): QT += declarative -QT += sql script +QT += sql script webkit macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativesqldatabase.cpp diff --git a/qtdeclarative/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro b/qtdeclarative/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro index 8d4b410..46a3dae 100644 --- a/qtdeclarative/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro +++ b/qtdeclarative/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro @@ -2,7 +2,7 @@ load(qttest_p4) contains(QT_CONFIG,declarative): QT += declarative gui macx:CONFIG -= app_bundle -include(../../../../tools/qml/qml.pri) +include(../../../../tools/qmlviewer/qml.pri) SOURCES += tst_qdeclarativeviewer.cpp diff --git a/qtphonon/tests/auto/auto.pro b/qtphonon/tests/auto/auto.pro new file mode 100644 index 0000000..ef6bdf4 --- /dev/null +++ b/qtphonon/tests/auto/auto.pro @@ -0,0 +1,3 @@ +TEMPLATE = subdirs + +contains(QT_CONFIG, phonon): SUBDIRS += phonon.pro diff --git a/qtxmlpatterns/tests/auto/qapplicationargumentparser/qapplicationargumentparser.pro b/qtxmlpatterns/tests/auto/qapplicationargumentparser/qapplicationargumentparser.pro index df32e92..80e207f 100644 --- a/qtxmlpatterns/tests/auto/qapplicationargumentparser/qapplicationargumentparser.pro +++ b/qtxmlpatterns/tests/auto/qapplicationargumentparser/qapplicationargumentparser.pro @@ -3,4 +3,4 @@ SOURCES += tst_qapplicationargumentparser.cpp \ ../../../tools/xmlpatterns/qapplicationargument.cpp \ ../../../tools/xmlpatterns/qapplicationargumentparser.cpp QT -= gui -INCLUDEPATH += $$QT_SOURCE_TREE/tools/xmlpatterns/ +INCLUDEPATH += ../../../tools/xmlpatterns/ diff --git a/qtxmlpatterns/tests/auto/xmlpatternsschema/xmlpatternsschema.pro b/qtxmlpatterns/tests/auto/xmlpatternsschema/xmlpatternsschema.pro index 2ba869a..734ac26 100644 --- a/qtxmlpatterns/tests/auto/xmlpatternsschema/xmlpatternsschema.pro +++ b/qtxmlpatterns/tests/auto/xmlpatternsschema/xmlpatternsschema.pro @@ -1,6 +1,8 @@ load(qttest_p4) +load(qt_module) + SOURCES += tst_xmlpatternsschema.cpp \ include (../xmlpatterns.pri) -INCLUDEPATH += $$QT_BUILD_TREE/include/QtXmlPatterns/private +INCLUDEPATH += $$QT.xmlpatterns.private_includes diff --git a/qtxmlpatterns/tests/auto/xmlpatternssdk/xmlpatternssdk.pro b/qtxmlpatterns/tests/auto/xmlpatternssdk/xmlpatternssdk.pro index 6204f01..9ba9cb6 100644 --- a/qtxmlpatterns/tests/auto/xmlpatternssdk/xmlpatternssdk.pro +++ b/qtxmlpatterns/tests/auto/xmlpatternssdk/xmlpatternssdk.pro @@ -1,3 +1,5 @@ +load(qt_module) + include (../xmlpatterns.pri) TARGET = $$XMLPATTERNS_SDK @@ -27,9 +29,8 @@ DESTDIR = $$QT_BUILD_TREE/lib # syncqt doesn't copy headers in tools/ so let's manually ensure # it works with shadow builds and source builds. -INCLUDEPATH += $$QT_BUILD_TREE/include/QtXmlPatterns/private \ - $$QT_SOURCE_TREE/include/QtXmlPatterns/private \ - $$QT_SOURCE_TREE/tools/xmlpatterns +INCLUDEPATH += $$QT.xmlpatterns.private_includes \ + ../../../tools/xmlpatterns HEADERS = ASTItem.h \ DebugExpressionFactory.h \ -- 1.7.3.2.343.g7d43d