summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-06-27 17:53:37 +0200
committerQt by Nokia <qt-info@nokia.com>2012-06-27 21:28:25 +0200
commit5d905cadff12dcad49b603cac54b915fb242d499 (patch)
tree03952811c1a1aea7caa10436435c41a8b348d3cd
parentc4765f686f08aed34d3adb2847c2dd3289958711 (diff)
auto-generate module pris
Change-Id: I818eb4900cb6ac4de427e1b7db0c6fdab3f60d0f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
-rw-r--r--modules/qt_jsondb.pri18
-rw-r--r--modules/qt_jsondbcompat.pri18
-rw-r--r--modules/qt_jsondbpartition.pri18
-rw-r--r--src/client/client.pro15
-rw-r--r--src/clientcompat/clientcompat.pro16
-rw-r--r--src/partition/partition.pro15
-rw-r--r--sync.profile5
7 files changed, 18 insertions, 87 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/src/client/client.pro b/src/client/client.pro
index b4417d0..7a58e8d 100644
--- a/src/client/client.pro
+++ b/src/client/client.pro
@@ -1,17 +1,14 @@
-TEMPLATE = lib
-TARGET = $$QT.jsondb.name
-MODULE = jsondb
-
load(qt_module)
-load(qt_module_config)
-DESTDIR = $$QT.jsondb.libs
-VERSION = $$QT.jsondb.VERSION
+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
diff --git a/src/clientcompat/clientcompat.pro b/src/clientcompat/clientcompat.pro
index c29273d..cd97827 100644
--- a/src/clientcompat/clientcompat.pro
+++ b/src/clientcompat/clientcompat.pro
@@ -1,17 +1,15 @@
-TEMPLATE = lib
-TARGET = $$QT.jsondbcompat.name
-MODULE = jsondbcompat
-
load(qt_module)
-load(qt_module_config)
-DESTDIR = $$QT.jsondbcompat.libs
-VERSION = $$QT.jsondbcompat.VERSION
+MODULE = jsondbcompat
+TARGET = QtJsonDbCompat
+VERSION = 1.0.0
+
+QT = core
+QT_PRIVATE = network
-QT = core network
+load(qt_module_config)
CONFIG += module create_prl
-MODULE_PRI = ../../modules/qt_jsondbcompat.pri
include(../jsonstream/jsonstream.pri)
diff --git a/src/partition/partition.pro b/src/partition/partition.pro
index 88bfd52..b6b15df 100644
--- a/src/partition/partition.pro
+++ b/src/partition/partition.pro
@@ -1,17 +1,12 @@
-TEMPLATE = lib
-TARGET = $$QT.jsondbpartition.name
-MODULE = jsondbpartition
-
load(qt_module)
-load(qt_module_config)
-DESTDIR = $$QT.jsondbpartition.libs
-VERSION = $$QT.jsondbpartition.VERSION
-
-QT = core network qml
+MODULE = jsondbpartition
+TARGET = QtJsonDbPartition
+VERSION = 1.0.0
+QT = core qml
CONFIG += module create_prl
-MODULE_PRI = ../../modules/qt_jsondbpartition.pri
+load(qt_module_config)
include(../3rdparty/btree/btree.pri)
include(../hbtree/hbtree.pri)
diff --git a/sync.profile b/sync.profile
index 0d98291..d472cdf 100644
--- a/sync.profile
+++ b/sync.profile
@@ -13,11 +13,6 @@
"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.