14 files changed, 30 insertions, 59 deletions
diff --git a/src/client/client.pro b/src/client/client.pro
index 32a46bf4..065d497f 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 5ca2217a..2d18d519 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 6ae0fcbb..5efd8b92 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 a85524bf..7a13adcb 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 741a53bd..86f71a0e 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 133974bb..75839985 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 f1d30f15..f1d30f15 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 cbc54ebf..5d07a596 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 6df8f9a8..48eb0dc8 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 9b88409b..c66e40c2 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 17da5b8a..17da5b8a 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 7876b1c3..36c993cf 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 c1bc3759..549a2773 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 79ec7d08..4ef3f9d5 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