diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-03-30 15:57:51 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-27 21:28:30 +0200 |
| commit | cb0801bc3291165ec4d31adcc3018c9e1e61e4fe (patch) | |
| tree | 79a6c546f87bc5a3dfc7ff952f2589c267d262e0 /tests | |
| parent | 5d905cadff12dcad49b603cac54b915fb242d499 (diff) | |
build system cleanups
- load(qt_module) => load(qt_build_config)
- remove:
- CONFIG+=module (obsolete)
- pointless CONFIG+=create_prl
- pointless setting of QMAKE_FRAMEWORK_BUNDLE_NAME
- code relating to module version headers (automated now)
- %mastercontent assignment (automated now)
- qmake -project boilerplate
Change-Id: I036d7e737b4458309067c383642cddfb90599f62
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
Diffstat (limited to 'tests')
9 files changed, 18 insertions, 27 deletions
diff --git a/tests/auto/jsondb-listmodel/jsondb-listmodel.pro b/tests/auto/jsondb-listmodel/jsondb-listmodel.pro index f3307ebb..e2b83c50 100644 --- a/tests/auto/jsondb-listmodel/jsondb-listmodel.pro +++ b/tests/auto/jsondb-listmodel/jsondb-listmodel.pro @@ -1,7 +1,4 @@ -TEMPLATE = app TARGET = tst_jsondb-listmodel -DEPENDPATH += . -INCLUDEPATH += . QT = core network testlib gui qml jsondbcompat-private CONFIG -= app_bundle diff --git a/tests/auto/jsondbcachinglistmodel/jsondbcachinglistmodel.pro b/tests/auto/jsondbcachinglistmodel/jsondbcachinglistmodel.pro index fd7fbb18..40187267 100644 --- a/tests/auto/jsondbcachinglistmodel/jsondbcachinglistmodel.pro +++ b/tests/auto/jsondbcachinglistmodel/jsondbcachinglistmodel.pro @@ -1,7 +1,7 @@ -TEMPLATE = app TARGET = tst_jsondbcachinglistmodel -DEPENDPATH += . -INCLUDEPATH += . ../../shared/ + +DEPENDPATH += ../../shared/ +INCLUDEPATH += ../../shared/ QT = core network testlib gui qml jsondb-private CONFIG -= app_bundle diff --git a/tests/auto/jsondblistmodel/jsondblistmodel.pro b/tests/auto/jsondblistmodel/jsondblistmodel.pro index 10276011..ed86def4 100644 --- a/tests/auto/jsondblistmodel/jsondblistmodel.pro +++ b/tests/auto/jsondblistmodel/jsondblistmodel.pro @@ -1,7 +1,7 @@ -TEMPLATE = app TARGET = tst_jsondblistmodel -DEPENDPATH += . -INCLUDEPATH += . ../../shared/ + +DEPENDPATH += ../../shared/ +INCLUDEPATH += ../../shared/ QT = core network testlib gui qml jsondb CONFIG -= app_bundle diff --git a/tests/auto/jsondbnotification/jsondbnotification.pro b/tests/auto/jsondbnotification/jsondbnotification.pro index f6033f54..1fb09628 100644 --- a/tests/auto/jsondbnotification/jsondbnotification.pro +++ b/tests/auto/jsondbnotification/jsondbnotification.pro @@ -1,7 +1,7 @@ -TEMPLATE = app TARGET = tst_jsondbnotification -DEPENDPATH += . -INCLUDEPATH += . ../../shared/ + +DEPENDPATH += ../../shared/ +INCLUDEPATH += ../../shared/ QT = core network testlib gui qml jsondb CONFIG -= app_bundle diff --git a/tests/auto/jsondbpartition/jsondbpartition.pro b/tests/auto/jsondbpartition/jsondbpartition.pro index 588e36eb..c4d4b8d0 100644 --- a/tests/auto/jsondbpartition/jsondbpartition.pro +++ b/tests/auto/jsondbpartition/jsondbpartition.pro @@ -1,7 +1,7 @@ -TEMPLATE = app TARGET = tst_jsondbpartition -DEPENDPATH += . -INCLUDEPATH += . ../../shared/ + +DEPENDPATH += ../../shared/ +INCLUDEPATH += ../../shared/ QT = core network testlib gui qml jsondb CONFIG -= app_bundle diff --git a/tests/auto/jsondbqueryobject/jsondbqueryobject.pro b/tests/auto/jsondbqueryobject/jsondbqueryobject.pro index 9ba7d63f..00b48012 100644 --- a/tests/auto/jsondbqueryobject/jsondbqueryobject.pro +++ b/tests/auto/jsondbqueryobject/jsondbqueryobject.pro @@ -1,7 +1,7 @@ -TEMPLATE = app TARGET = tst_jsondbqueryobject -DEPENDPATH += . -INCLUDEPATH += . ../../shared/ + +DEPENDPATH += ../../shared/ +INCLUDEPATH += ../../shared/ QT = core network testlib gui qml jsondb CONFIG -= app_bundle diff --git a/tests/auto/jsondbsortinglistmodel/jsondbsortinglistmodel.pro b/tests/auto/jsondbsortinglistmodel/jsondbsortinglistmodel.pro index 70cd2db2..cc7e7de2 100644 --- a/tests/auto/jsondbsortinglistmodel/jsondbsortinglistmodel.pro +++ b/tests/auto/jsondbsortinglistmodel/jsondbsortinglistmodel.pro @@ -1,7 +1,7 @@ -TEMPLATE = app TARGET = tst_jsondbsortinglistmodel -DEPENDPATH += . -INCLUDEPATH += . ../../shared/ + +DEPENDPATH += ../../shared/ +INCLUDEPATH += ../../shared/ QT = core network testlib gui qml jsondb CONFIG -= app_bundle diff --git a/tests/benchmarks/jsondbcachinglistmodel/jsondbcachinglistmodel.pro b/tests/benchmarks/jsondbcachinglistmodel/jsondbcachinglistmodel.pro index b68a007d..acd1a102 100644 --- a/tests/benchmarks/jsondbcachinglistmodel/jsondbcachinglistmodel.pro +++ b/tests/benchmarks/jsondbcachinglistmodel/jsondbcachinglistmodel.pro @@ -1,7 +1,4 @@ -TEMPLATE = app TARGET = tst_bench_jsondbcachinglistmodel -DEPENDPATH += . -INCLUDEPATH += . QT = core network testlib gui qml jsondb CONFIG -= app_bundle diff --git a/tests/benchmarks/jsondbsortinglistmodel/jsondbsortinglistmodel.pro b/tests/benchmarks/jsondbsortinglistmodel/jsondbsortinglistmodel.pro index 33b437d4..1e70d181 100644 --- a/tests/benchmarks/jsondbsortinglistmodel/jsondbsortinglistmodel.pro +++ b/tests/benchmarks/jsondbsortinglistmodel/jsondbsortinglistmodel.pro @@ -1,7 +1,4 @@ -TEMPLATE = app TARGET = tst_bench_jsondbsortinglistmodel -DEPENDPATH += . -INCLUDEPATH += . QT = core network testlib gui qml jsondb CONFIG -= app_bundle |