Merge branch 'buildsystem'

Change-Id: Icbc666ef5728194531110a6827870260e67c4147

30 files changed, 54 insertions, 156 deletions

diff --git a/modules/qt_jsondb.pri b/modules/qt_jsondb.pri
deleted file mode 100644
index 625462c..0000000
--- a/modules/qt_jsondb.pri
+++ /dev/null
@@ -1,18 +0,0 @@
-!win32 {
-QT.jsondb.VERSION = 1.0.0
-QT.jsondb.MAJOR_VERSION = 1
-QT.jsondb.MINOR_VERSION = 0
-QT.jsondb.PATCH_VERSION = 0
-
-QT.jsondb.name = QtJsonDb
-QT.jsondb.bins = $$QT_MODULE_BIN_BASE
-QT.jsondb.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtJsonDb
-QT.jsondb.private_includes = $$QT_MODULE_INCLUDE_BASE/QtJsonDb/$$QT.jsondb.VERSION
-QT.jsondb.sources = $$QT_MODULE_BASE/src
-QT.jsondb.libs = $$QT_MODULE_LIB_BASE
-QT.jsondb.plugins = $$QT_MODULE_PLUGIN_BASE
-QT.jsondb.imports = $$QT_MODULE_IMPORT_BASE
-QT.jsondb.depends = core network qml
-
-QT_CONFIG += jsondb
-}
diff --git a/modules/qt_jsondbcompat.pri b/modules/qt_jsondbcompat.pri
deleted file mode 100644
index fbda4b3..0000000
--- a/modules/qt_jsondbcompat.pri
+++ /dev/null
@@ -1,18 +0,0 @@
-!win32 {
-QT.jsondbcompat.VERSION = 1.0.0
-QT.jsondbcompat.MAJOR_VERSION = 1
-QT.jsondbcompat.MINOR_VERSION = 0
-QT.jsondbcompat.PATCH_VERSION = 0
-
-QT.jsondbcompat.name = QtJsonDbCompat
-QT.jsondbcompat.bins = $$QT_MODULE_BIN_BASE
-QT.jsondbcompat.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtJsonDbCompat
-QT.jsondbcompat.private_includes = $$QT_MODULE_INCLUDE_BASE/QtJsonDbCompat/$$QT.jsondbcompat.VERSION
-QT.jsondbcompat.sources = $$QT_MODULE_BASE/src
-QT.jsondbcompat.libs = $$QT_MODULE_LIB_BASE
-QT.jsondbcompat.plugins = $$QT_MODULE_PLUGIN_BASE
-QT.jsondbcompat.imports = $$QT_MODULE_IMPORT_BASE
-QT.jsondbcompat.depends = core network qml
-
-QT_CONFIG += jsondbcompat
-}
diff --git a/modules/qt_jsondbpartition.pri b/modules/qt_jsondbpartition.pri
deleted file mode 100644
index f68597a..0000000
--- a/modules/qt_jsondbpartition.pri
+++ /dev/null
@@ -1,18 +0,0 @@
-!win32 {
-QT.jsondbpartition.VERSION = 1.0.0
-QT.jsondbpartition.MAJOR_VERSION = 1
-QT.jsondbpartition.MINOR_VERSION = 0
-QT.jsondbpartition.PATCH_VERSION = 0
-
-QT.jsondbpartition.name = QtJsonDbPartition
-QT.jsondbpartition.bins = $$QT_MODULE_BIN_BASE
-QT.jsondbpartition.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtJsonDbPartition
-QT.jsondbpartition.private_includes = $$QT_MODULE_INCLUDE_BASE/QtJsonDbPartition/$$QT.jsondbpartition.VERSION
-QT.jsondbpartition.sources = $$QT_MODULE_BASE/src
-QT.jsondbpartition.libs = $$QT_MODULE_LIB_BASE
-QT.jsondbpartition.plugins = $$QT_MODULE_PLUGIN_BASE
-QT.jsondbpartition.imports = $$QT_MODULE_IMPORT_BASE
-QT.jsondbpartition.depends = core network qml
-
-QT_CONFIG += jsondbpartition
-}
diff --git a/qtjsondb.pro b/qtjsondb.pro
index fade7dd..62976bb 100644
--- a/qtjsondb.pro
+++ b/qtjsondb.pro
@@ -1,3 +1,7 @@
+load(configure)
+qtCompileTest(icu)
+qtCompileTest(libedit)
+
 TEMPLATE = subdirs
 
 module_qtjsondb_src.subdir = src
diff --git a/src/client/client.pro b/src/client/client.pro
index 32a46bf..065d497 100644
--- a/src/client/client.pro
+++ b/src/client/client.pro
@@ -1,24 +1,17 @@
-TEMPLATE = lib
-TARGET = $$QT.jsondb.name
-MODULE = jsondb
-
-load(qt_module)
-load(qt_module_config)
+load(qt_build_config)
 
-DESTDIR = $$QT.jsondb.libs
-VERSION = $$QT.jsondb.VERSION
-DEFINES += QT_JSONDB_LIB
+MODULE = jsondb
+TARGET = QtJsonDb
+VERSION = 1.0.0
 
-QT = core network qml jsondbpartition
+QT = core
+QT_PRIVATE = network qml jsondbpartition
 
-CONFIG += module create_prl
-MODULE_PRI = ../../modules/qt_jsondb.pri
+load(qt_module_config)
 
 include(../jsonstream/jsonstream.pri)
 INCLUDEPATH += $$PWD/../common
 
-HEADERS += qtjsondbversion.h
-
 HEADERS += \
     qjsondbglobal.h \
     qjsondbstrings_p.h \
@@ -59,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/client/qjsondbglobal.h b/src/client/qjsondbglobal.h
index 5ca2217..2d18d51 100644
--- a/src/client/qjsondbglobal.h
+++ b/src/client/qjsondbglobal.h
@@ -44,7 +44,7 @@
 
 #include "QtCore/qglobal.h"
 
-#if defined(QT_JSONDB_LIB)
+#if defined(QT_BUILD_JSONDB_LIB)
 #  define Q_JSONDB_EXPORT Q_DECL_EXPORT
 #else
 #  define Q_JSONDB_EXPORT Q_DECL_IMPORT
diff --git a/src/clientcompat/clientcompat.pro b/src/clientcompat/clientcompat.pro
index 6ae0fcb..5efd8b9 100644
--- a/src/clientcompat/clientcompat.pro
+++ b/src/clientcompat/clientcompat.pro
@@ -1,25 +1,18 @@
-TEMPLATE = lib
-TARGET = $$QT.jsondbcompat.name
-MODULE = jsondbcompat
-
-load(qt_module)
-load(qt_module_config)
+load(qt_build_config)
 
-DESTDIR = $$QT.jsondbcompat.libs
-VERSION = $$QT.jsondbcompat.VERSION
-DEFINES += QT_ADDON_JSONDB_LIB
+MODULE = jsondbcompat
+TARGET = QtJsonDbCompat
+VERSION = 1.0.0
 
-QT = core network
+QT = core
+QT_PRIVATE = network
 
-CONFIG += module create_prl
-MODULE_PRI = ../../modules/qt_jsondbcompat.pri
+load(qt_module_config)
 
 include(../jsonstream/jsonstream.pri)
 
 INCLUDEPATH += $$PWD/../common
 
-HEADERS += qtjsondbcompatversion.h
-
 HEADERS += \
     jsondb-error.h \
     jsondb-client.h \
@@ -41,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/clientcompat/jsondb-global.h b/src/clientcompat/jsondb-global.h
index a85524b..7a13adc 100644
--- a/src/clientcompat/jsondb-global.h
+++ b/src/clientcompat/jsondb-global.h
@@ -43,7 +43,7 @@
 
 #include "qglobal.h"
 
-#if defined(QT_ADDON_JSONDB_LIB)
+#if defined(QT_BUILD_JSONDBCOMPAT_LIB)
 #  define Q_ADDON_JSONDB_EXPORT Q_DECL_EXPORT
 #else
 #  define Q_ADDON_JSONDB_EXPORT Q_DECL_IMPORT
diff --git a/src/jsonstream/jsonstream.pri b/src/jsonstream/jsonstream.pri
index 741a53b..86f71a0 100644
--- a/src/jsonstream/jsonstream.pri
+++ b/src/jsonstream/jsonstream.pri
@@ -1,3 +1,3 @@
 INCLUDEPATH += $$PWD
-LIBS_PRIVATE += -L$$QT_MODULE_LIB_BASE -lQtJsonDbJsonStream
-POST_TARGETDEPS += $${QT_MODULE_LIB_BASE}$${QMAKE_DIR_SEP}libQtJsonDbJsonStream.a
+LIBS_PRIVATE += -L$$shadowed($$PWD) -lQtJsonDbJsonStream
+POST_TARGETDEPS += $$shadowed($$PWD)/libQtJsonDbJsonStream.a
diff --git a/src/jsonstream/jsonstream.pro b/src/jsonstream/jsonstream.pro
index 133974b..7583998 100644
--- a/src/jsonstream/jsonstream.pro
+++ b/src/jsonstream/jsonstream.pro
@@ -1,7 +1,6 @@
 TARGET = QtJsonDbJsonStream
 
 TEMPLATE = lib
-DESTDIR = $$QT_MODULE_LIB_BASE
 CONFIG += qt staticlib
 
 QT = core network
diff --git a/src/partition/schema-validation/jsondbcheckpoints_p.h b/src/partition/jsondbcheckpoints_p.h
index f1d30f1..f1d30f1 100644
--- a/src/partition/schema-validation/jsondbcheckpoints_p.h
+++ b/src/partition/jsondbcheckpoints_p.h
diff --git a/src/partition/jsondbobjecttypes_p.h b/src/partition/jsondbobjecttypes_p.h
index cbc54eb..5d07a59 100644
--- a/src/partition/jsondbobjecttypes_p.h
+++ b/src/partition/jsondbobjecttypes_p.h
@@ -45,7 +45,7 @@
 #include "jsondbpartitionglobal.h"
 #include "jsondbstrings.h"
 
-#include "schema-validation/jsondbschema_p.h"
+#include "jsondbschema_p.h"
 
 #include <QPair>
 
diff --git a/src/partition/jsondbpartition.h b/src/partition/jsondbpartition.h
index 6df8f9a..48eb0dc 100644
--- a/src/partition/jsondbpartition.h
+++ b/src/partition/jsondbpartition.h
@@ -53,7 +53,6 @@
 #include "jsondbowner.h"
 #include "jsondbpartitionspec.h"
 #include "jsondbstat.h"
-#include "jsondbschemamanager_p.h"
 
 QT_BEGIN_HEADER
 
diff --git a/src/partition/jsondbpartitionglobal.h b/src/partition/jsondbpartitionglobal.h
index 9b88409..c66e40c 100644
--- a/src/partition/jsondbpartitionglobal.h
+++ b/src/partition/jsondbpartitionglobal.h
@@ -44,7 +44,7 @@
 
 #include "QtCore/qglobal.h"
 
-#if defined(QT_JSONDB_PARTITION_LIB)
+#if defined(QT_BUILD_JSONDBPARTITION_LIB)
 #  define Q_JSONDB_PARTITION_EXPORT Q_DECL_EXPORT
 #else
 #  define Q_JSONDB_PARTITION_EXPORT Q_DECL_IMPORT
diff --git a/src/partition/schema-validation/jsondbschema_p.h b/src/partition/jsondbschema_p.h
index 17da5b8..17da5b8 100644
--- a/src/partition/schema-validation/jsondbschema_p.h
+++ b/src/partition/jsondbschema_p.h
diff --git a/src/partition/jsondbschemamanager_impl_p.h b/src/partition/jsondbschemamanager_impl_p.h
index 7876b1c..36c993c 100644
--- a/src/partition/jsondbschemamanager_impl_p.h
+++ b/src/partition/jsondbschemamanager_impl_p.h
@@ -43,7 +43,7 @@
 #define JSONDB_SCHEMA_MANAGER_IMPL_P_H
 
 #include "jsondbschemamanager_p.h"
-#include "schema-validation/jsondbschema_p.h"
+#include "jsondbschema_p.h"
 
 QT_BEGIN_NAMESPACE_JSONDB_PARTITION
 
diff --git a/src/partition/jsondbschemamanager_p.h b/src/partition/jsondbschemamanager_p.h
index c1bc375..549a277 100644
--- a/src/partition/jsondbschemamanager_p.h
+++ b/src/partition/jsondbschemamanager_p.h
@@ -48,7 +48,7 @@
 #include <QtCore/qpair.h>
 #include <QtCore/qmap.h>
 
-#include "schema-validation/jsondbschema_p.h"
+#include "jsondbschema_p.h"
 #include "jsondbobjecttypes_p.h"
 #include "jsondbobject.h"
 
diff --git a/src/partition/partition.pro b/src/partition/partition.pro
index 79ec7d0..4ef3f9d 100644
--- a/src/partition/partition.pro
+++ b/src/partition/partition.pro
@@ -1,19 +1,12 @@
-TEMPLATE = lib
-TARGET = $$QT.jsondbpartition.name
+load(qt_build_config)
+
 MODULE = jsondbpartition
+TARGET = QtJsonDbPartition
+VERSION = 1.0.0
+QT = core qml
 
-load(qt_module)
 load(qt_module_config)
 
-DESTDIR = $$QT.jsondbpartition.libs
-VERSION = $$QT.jsondbpartition.VERSION
-DEFINES += QT_JSONDB_PARTITION_LIB
-
-QT = core network qml
-
-CONFIG += module create_prl
-MODULE_PRI = ../../modules/qt_jsondbpartition.pri
-
 include(../3rdparty/btree/btree.pri)
 include(../hbtree/hbtree.pri)
 
@@ -52,8 +45,8 @@ HEADERS += \
     jsondbpartitionspec.h \
     jsondbquerytokenizer_p.h \
     jsondbqueryparser.h \
-    schema-validation/jsondbschema_p.h \
-    schema-validation/jsondbcheckpoints_p.h
+    jsondbschema_p.h \
+    jsondbcheckpoints_p.h
 
 SOURCES += \
     jsondbowner.cpp \
@@ -77,9 +70,7 @@ SOURCES += \
     jsondbquerytokenizer.cpp \
     jsondbqueryparser.cpp
 
-mac:QMAKE_FRAMEWORK_BUNDLE_NAME = $$QT.jsondbpartition.name
-
-contains(config_test_icu, yes) {
+config_icu {
     LIBS += -licuuc -licui18n
 } else {
     DEFINES += NO_COLLATION_SUPPORT
diff --git a/sync.profile b/sync.profile
index 0d98291..72789c2 100644
--- a/sync.profile
+++ b/sync.profile
@@ -6,18 +6,8 @@
 %moduleheaders = ( # restrict the module headers to those found in relative path
 );
 %classnames = (
-    "qtjsondbversion.h" => "QtJsonDbVersion",
     "qjsondbglobal.h" => "QtJsonDbGlobal",
 );
-%mastercontent = (
-    "core" => "#include <QtCore/QtCore>\n",
-    "network" => "#include <QtNetwork/QtNetwork>\n",
-);
-%modulepris = (
-    "QtJsonDb" => "$basedir/modules/qt_jsondb.pri",
-    "QtJsonDbPartition" => "$basedir/modules/qt_jsondbpartition.pri",
-    "QtJsonDbCompat" => "$basedir/modules/qt_jsondbcompat.pri",
-);
 $publicclassregexp = "QJsonDb.+";
 # Module dependencies.
 # Every module that is required to build this module should have one entry.
@@ -31,7 +21,3 @@ $publicclassregexp = "QJsonDb.+";
         "qtjsbackend" => "refs/heads/master",
         "qtxmlpatterns" => "refs/heads/master",
 );
-%configtests = (
-        "icu" => {},
-        "libedit" => {}
-);
diff --git a/tests/auto/jsondb-listmodel/jsondb-listmodel.pro b/tests/auto/jsondb-listmodel/jsondb-listmodel.pro
index f3307eb..e2b83c5 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 fd7fbb1..4018726 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 1027601..ed86def 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 f6033f5..1fb0962 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 588e36e..c4d4b8d 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 9ba7d63..00b4801 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 70cd2db..cc7e7de 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/auto/partition/partition.pro b/tests/auto/partition/partition.pro
index ab693e5..c075828 100644
--- a/tests/auto/partition/partition.pro
+++ b/tests/auto/partition/partition.pro
@@ -22,7 +22,7 @@ include(../../../src/hbtree/hbtree.pri)
 SOURCES += \
     testpartition.cpp \
 
-contains(config_test_icu, yes) {
+config_icu {
     LIBS += -licuuc -licui18n
 } else {
     DEFINES += NO_COLLATION_SUPPORT
diff --git a/tests/benchmarks/jsondbcachinglistmodel/jsondbcachinglistmodel.pro b/tests/benchmarks/jsondbcachinglistmodel/jsondbcachinglistmodel.pro
index b68a007..acd1a10 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 33b437d..1e70d18 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
diff --git a/tools/tools.pro b/tools/tools.pro
index 1da075a..341967d 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -1,2 +1,2 @@
 TEMPLATE = subdirs
-contains(config_test_libedit, yes):SUBDIRS += jsondb-client
+config_libedit:SUBDIRS += jsondb-client