From cb0801bc3291165ec4d31adcc3018c9e1e61e4fe Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 30 Mar 2012 15:57:51 +0200 Subject: 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 --- src/client/client.pro | 7 +------ src/clientcompat/clientcompat.pro | 8 +------- src/partition/partition.pro | 5 +---- sync.profile | 5 ----- tests/auto/jsondb-listmodel/jsondb-listmodel.pro | 3 --- tests/auto/jsondbcachinglistmodel/jsondbcachinglistmodel.pro | 6 +++--- tests/auto/jsondblistmodel/jsondblistmodel.pro | 6 +++--- tests/auto/jsondbnotification/jsondbnotification.pro | 6 +++--- tests/auto/jsondbpartition/jsondbpartition.pro | 6 +++--- tests/auto/jsondbqueryobject/jsondbqueryobject.pro | 6 +++--- tests/auto/jsondbsortinglistmodel/jsondbsortinglistmodel.pro | 6 +++--- .../benchmarks/jsondbcachinglistmodel/jsondbcachinglistmodel.pro | 3 --- .../benchmarks/jsondbsortinglistmodel/jsondbsortinglistmodel.pro | 3 --- 13 files changed, 21 insertions(+), 49 deletions(-) diff --git a/src/client/client.pro b/src/client/client.pro index 7a58e8de..065d497f 100644 --- a/src/client/client.pro +++ b/src/client/client.pro @@ -1,4 +1,4 @@ -load(qt_module) +load(qt_build_config) MODULE = jsondb TARGET = QtJsonDb @@ -7,14 +7,11 @@ VERSION = 1.0.0 QT = core QT_PRIVATE = network qml jsondbpartition -CONFIG += module create_prl load(qt_module_config) include(../jsonstream/jsonstream.pri) INCLUDEPATH += $$PWD/../common -HEADERS += qtjsondbversion.h - HEADERS += \ qjsondbglobal.h \ qjsondbstrings_p.h \ @@ -55,5 +52,3 @@ SOURCES += \ qjsondbmodelcache_p.cpp \ qjsondbmodelutils_p.cpp \ qjsondbquerymodel_p.cpp - -mac:QMAKE_FRAMEWORK_BUNDLE_NAME = $$QT.jsondb.name diff --git a/src/clientcompat/clientcompat.pro b/src/clientcompat/clientcompat.pro index cd978278..5efd8b92 100644 --- a/src/clientcompat/clientcompat.pro +++ b/src/clientcompat/clientcompat.pro @@ -1,4 +1,4 @@ -load(qt_module) +load(qt_build_config) MODULE = jsondbcompat TARGET = QtJsonDbCompat @@ -9,14 +9,10 @@ QT_PRIVATE = network load(qt_module_config) -CONFIG += module create_prl - include(../jsonstream/jsonstream.pri) INCLUDEPATH += $$PWD/../common -HEADERS += qtjsondbcompatversion.h - HEADERS += \ jsondb-error.h \ jsondb-client.h \ @@ -38,5 +34,3 @@ SOURCES += \ jsondb-oneshot.cpp \ jsondb-notification.cpp \ jsondb-strings.cpp - -mac:QMAKE_FRAMEWORK_BUNDLE_NAME = $$QT.jsondbcompat.name diff --git a/src/partition/partition.pro b/src/partition/partition.pro index b6b15dfc..2cb9fced 100644 --- a/src/partition/partition.pro +++ b/src/partition/partition.pro @@ -1,11 +1,10 @@ -load(qt_module) +load(qt_build_config) MODULE = jsondbpartition TARGET = QtJsonDbPartition VERSION = 1.0.0 QT = core qml -CONFIG += module create_prl load(qt_module_config) include(../3rdparty/btree/btree.pri) @@ -71,8 +70,6 @@ SOURCES += \ jsondbquerytokenizer.cpp \ jsondbqueryparser.cpp -mac:QMAKE_FRAMEWORK_BUNDLE_NAME = $$QT.jsondbpartition.name - contains(config_test_icu, yes) { LIBS += -licuuc -licui18n } else { diff --git a/sync.profile b/sync.profile index d472cdf3..10a62c0a 100644 --- a/sync.profile +++ b/sync.profile @@ -6,13 +6,8 @@ %moduleheaders = ( # restrict the module headers to those found in relative path ); %classnames = ( - "qtjsondbversion.h" => "QtJsonDbVersion", "qjsondbglobal.h" => "QtJsonDbGlobal", ); -%mastercontent = ( - "core" => "#include \n", - "network" => "#include \n", -); $publicclassregexp = "QJsonDb.+"; # Module dependencies. # Every module that is required to build this module should have one entry. 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 -- cgit v1.2.3