package as qt module "json"

Change-Id: I798220a58d808f3254062d59ea9479fb74dd2342
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

8 files changed, 63 insertions, 13 deletions

diff --git a/modules/qt_json.pri b/modules/qt_json.pri
new file mode 100644
index 0000000..4485a45
--- /dev/null
+++ b/modules/qt_json.pri
@@ -0,0 +1,16 @@
+QT.json.VERSION = 1.0.0
+QT.json.MAJOR_VERSION = 1
+QT.json.MINOR_VERSION = 0
+QT.json.PATCH_VERSION = 0
+
+QT.json.name = QtJson
+QT.json.bins = $$QT_MODULE_BIN_BASE
+QT.json.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtJson
+QT.json.private_includes = $$QT_MODULE_INCLUDE_BASE/QtJson/$$QT.json.VERSION
+QT.json.sources = $$QT_MODULE_BASE/src
+QT.json.libs = $$QT_MODULE_LIB_BASE
+QT.json.plugins = $$QT_MODULE_PLUGIN_BASE
+QT.json.imports = $$QT_MODULE_IMPORT_BASE
+QT.json.depends = core
+
+QT_CONFIG += json
diff --git a/src/qjsonarray.h b/src/qjsonarray.h
index 136dcee..f0863c1 100644
--- a/src/qjsonarray.h
+++ b/src/qjsonarray.h
@@ -49,7 +49,7 @@ class QStringList;
 namespace QtJson
 {
 
-class JsonArray
+class Q_JSON_EXPORT JsonArray
 {
 public:
     JsonArray();
diff --git a/src/qjsondocument.h b/src/qjsondocument.h
index c7885cc..c83054e 100644
--- a/src/qjsondocument.h
+++ b/src/qjsondocument.h
@@ -47,7 +47,7 @@
 
 namespace QtJson {
 
-class JsonDocument
+class Q_JSON_EXPORT JsonDocument
 {
 public:
     JsonDocument();
diff --git a/src/qjsonglobal.h b/src/qjsonglobal.h
index b1f4d52..31050f1 100644
--- a/src/qjsonglobal.h
+++ b/src/qjsonglobal.h
@@ -45,6 +45,12 @@
 #include <qglobal.h>
 #include <qstring.h>
 
+#if defined(QT_JSON_LIB)
+#  define Q_JSON_EXPORT Q_DECL_EXPORT
+#else
+#  define Q_JSON_EXPORT Q_DECL_IMPORT
+#endif
+
 namespace QtJson
 {
 // ### FIXME
diff --git a/src/qjsonobject.h b/src/qjsonobject.h
index ab0711e..e7d9261 100644
--- a/src/qjsonobject.h
+++ b/src/qjsonobject.h
@@ -47,7 +47,7 @@
 
 namespace QtJson {
 
-class JsonObject
+class Q_JSON_EXPORT JsonObject
 {
 public:
     JsonObject();
diff --git a/src/qjsonvalue.h b/src/qjsonvalue.h
index 0e42d7f..55d2e14 100644
--- a/src/qjsonvalue.h
+++ b/src/qjsonvalue.h
@@ -48,7 +48,7 @@ class QVariant;
 
 namespace QtJson {
 
-class JsonValue {
+class Q_JSON_EXPORT JsonValue {
 public:
     JsonValue(ValueType = NullValue);
     JsonValue(bool b);
diff --git a/src/src.pro b/src/src.pro
index a697d12..e9c7691 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,9 +1,20 @@
 TEMPLATE = lib
+TARGET = $$QT.json.name
+MODULE = json
+
+load(qt_module)
+load(qt_module_config)
+
+DESTDIR = $$QT.json.libs
+VERSION = $$QT.json.VERSION
+DEFINES += QT_JSON_LIB
 
 QT = core
 
-TARGET = qtjson
-DESTDIR = ../lib
+CONFIG += module create_prl
+MODULE_PRI = ../modules/qt_json.pri
+
+HEADERS += qtjsonversion.h
 
 HEADERS += \
     qjson_p.h \
@@ -24,10 +35,4 @@ SOURCES += \
     qjsonwriter.cpp \
     qjsonparser.cpp
 
-
-
-
-
-
-
-
+mac:QMAKE_FRAMEWORK_BUNDLE_NAME = $$QT.json.name
diff --git a/sync.profile b/sync.profile
new file mode 100644
index 0000000..0bf0749
--- /dev/null
+++ b/sync.profile
@@ -0,0 +1,23 @@
+%modules = ( # path to module name map
+    "QtJson" => "$basedir/src",
+);
+%moduleheaders = ( # restrict the module headers to those found in relative path
+);
+%classnames = (
+    "qtjsonversion.h" => "QtJsonVersion",
+);
+%mastercontent = (
+    "core" => "#include <QtCore/QtCore>\n",
+);
+%modulepris = (
+    "QtJson" => "$basedir/modules/qt_json.pri",
+);
+# Module dependencies.
+# Every module that is required to build this module should have one entry.
+# Each of the module version specifiers can take one of the following values:
+#   - A specific Git revision.
+#   - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch)
+#
+%dependencies = (
+        "qtbase" => "refs/heads/master",
+);