Add changes required to build against Qt 5.3.0

Change-Id: If8375223594fcb28e8faabec888ba43a63754ba1
Reviewed-by: Sandro S. Andrade <sandroandrade@kde.org>

12 files changed, 15 insertions, 106 deletions

diff --git a/.qmake.conf b/.qmake.conf
index 2f09a2ba..16328b7d 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,3 +1,3 @@
 load(qt_build_config)
 
-MODULE_VERSION = 5.2.0
+MODULE_VERSION = 5.3.0
diff --git a/modules/qtduse.pri b/modules/qtduse.pri
deleted file mode 100644
index fca185b3..00000000
--- a/modules/qtduse.pri
+++ /dev/null
@@ -1,17 +0,0 @@
-QT.duse.VERSION = 5.2.0
-QT.duse.MAJOR_VERSION = 5
-QT.duse.MINOR_VERSION = 2
-QT.duse.PATCH_VERSION = 0
-
-QT.duse.name = QtDuse
-QT.duse.bins = $$QT_MODULE_BIN_BASE
-QT.duse.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/$$QT.duse.name
-QT.duse.private_includes = $$QT_MODULE_INCLUDE_BASE/$$QT.duse.name/$$QT.duse.VERSION
-QT.duse.sources = $$QT_MODULE_BASE/src/duse
-QT.duse.libs = $$QT_MODULE_LIB_BASE
-QT.duse.plugins = $$QT_MODULE_PLUGIN_BASE
-QT.duse.imports = $$QT_MODULE_IMPORT_BASE
-QT.duse.depends = core modeling
-
-QT.duse.DEFINES = QT_DUSE_LIB
-QT_CONFIG += duse
diff --git a/modules/qtmodeling.pri b/modules/qtmodeling.pri
deleted file mode 100644
index d781d5a5..00000000
--- a/modules/qtmodeling.pri
+++ /dev/null
@@ -1,17 +0,0 @@
-QT.modeling.VERSION = 5.2.0
-QT.modeling.MAJOR_VERSION = 5
-QT.modeling.MINOR_VERSION = 2
-QT.modeling.PATCH_VERSION = 0
-
-QT.modeling.name = QtModeling
-QT.modeling.bins = $$QT_MODULE_BIN_BASE
-QT.modeling.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/$$QT.modeling.name
-QT.modeling.private_includes = $$QT_MODULE_INCLUDE_BASE/$$QT.modeling.name/$$QT.modeling.VERSION
-QT.modeling.sources = $$QT_MODULE_BASE/src/modeling
-QT.modeling.libs = $$QT_MODULE_LIB_BASE
-QT.modeling.plugins = $$QT_MODULE_PLUGIN_BASE
-QT.modeling.imports = $$QT_MODULE_IMPORT_BASE
-QT.modeling.depends = core
-
-QT.modeling.DEFINES = QT_MODELING_LIB
-QT_CONFIG += modeling
diff --git a/modules/qtmodelingwidgets.pri b/modules/qtmodelingwidgets.pri
deleted file mode 100644
index f55a58c3..00000000
--- a/modules/qtmodelingwidgets.pri
+++ /dev/null
@@ -1,17 +0,0 @@
-QT.modelingwidgets.VERSION = 5.2.0
-QT.modelingwidgets.MAJOR_VERSION = 5
-QT.modelingwidgets.MINOR_VERSION = 2
-QT.modelingwidgets.PATCH_VERSION = 0
-
-QT.modelingwidgets.name = QtModelingWidgets
-QT.modelingwidgets.bins = $$QT_MODULE_BIN_BASE
-QT.modelingwidgets.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/$$QT.modelingwidgets.name
-QT.modelingwidgets.private_includes = $$QT_MODULE_INCLUDE_BASE/$$QT.modelingwidgets.name/$$QT.modelingwidgets.VERSION
-QT.modelingwidgets.sources = $$QT_MODULE_BASE/src/modelingwidgets
-QT.modelingwidgets.libs = $$QT_MODULE_LIB_BASE
-QT.modelingwidgets.plugins = $$QT_MODULE_PLUGIN_BASE
-QT.modelingwidgets.imports = $$QT_MODULE_IMPORT_BASE
-QT.modelingwidgets.depends = core modeling
-
-QT.modelingwidgets.DEFINES = QT_MODELINGWIDGETS_LIB
-QT_CONFIG += modelingwidgets
diff --git a/modules/qtmof.pri b/modules/qtmof.pri
deleted file mode 100644
index cffa572b..00000000
--- a/modules/qtmof.pri
+++ /dev/null
@@ -1,17 +0,0 @@
-QT.mof.VERSION = 5.2.0
-QT.mof.MAJOR_VERSION = 5
-QT.mof.MINOR_VERSION = 2
-QT.mof.PATCH_VERSION = 0
-
-QT.mof.name = QtMof
-QT.mof.bins = $$QT_MODULE_BIN_BASE
-QT.mof.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/$$QT.mof.name
-QT.mof.private_includes = $$QT_MODULE_INCLUDE_BASE/$$QT.mof.name/$$QT.mof.VERSION
-QT.mof.sources = $$QT_MODULE_BASE/src/mof
-QT.mof.libs = $$QT_MODULE_LIB_BASE
-QT.mof.plugins = $$QT_MODULE_PLUGIN_BASE
-QT.mof.imports = $$QT_MODULE_IMPORT_BASE
-QT.mof.depends = core modeling
-
-QT.mof.DEFINES = QT_MOF_LIB
-QT_CONFIG += mof
diff --git a/modules/qtsaduseprofile.pri b/modules/qtsaduseprofile.pri
deleted file mode 100644
index 27e9481d..00000000
--- a/modules/qtsaduseprofile.pri
+++ /dev/null
@@ -1,17 +0,0 @@
-QT.saduseprofile.VERSION = 5.2.0
-QT.saduseprofile.MAJOR_VERSION = 5
-QT.saduseprofile.MINOR_VERSION = 2
-QT.saduseprofile.PATCH_VERSION = 0
-
-QT.saduseprofile.name = QtSADuseProfile
-QT.saduseprofile.bins = $$QT_MODULE_BIN_BASE
-QT.saduseprofile.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/$$QT.saduseprofile.name
-QT.saduseprofile.private_includes = $$QT_MODULE_INCLUDE_BASE/$$QT.saduseprofile.name/$$QT.saduseprofile.VERSION
-QT.saduseprofile.sources = $$QT_MODULE_BASE/src/saduseprofile
-QT.saduseprofile.libs = $$QT_MODULE_LIB_BASE
-QT.saduseprofile.plugins = $$QT_MODULE_PLUGIN_BASE
-QT.saduseprofile.imports = $$QT_MODULE_IMPORT_BASE
-QT.saduseprofile.depends = core modeling uml
-
-QT.saduseprofile.DEFINES = QT_SADUSEPROFILE_LIB
-QT_CONFIG += saduseprofile
diff --git a/modules/qtuml.pri b/modules/qtuml.pri
deleted file mode 100644
index b7f8312f..00000000
--- a/modules/qtuml.pri
+++ /dev/null
@@ -1,17 +0,0 @@
-QT.uml.VERSION = 5.2.0
-QT.uml.MAJOR_VERSION = 5
-QT.uml.MINOR_VERSION = 2
-QT.uml.PATCH_VERSION = 0
-
-QT.uml.name = QtUml
-QT.uml.bins = $$QT_MODULE_BIN_BASE
-QT.uml.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/$$QT.uml.name
-QT.uml.private_includes = $$QT_MODULE_INCLUDE_BASE/$$QT.uml.name/$$QT.uml.VERSION
-QT.uml.sources = $$QT_MODULE_BASE/src/uml
-QT.uml.libs = $$QT_MODULE_LIB_BASE
-QT.uml.plugins = $$QT_MODULE_PLUGIN_BASE
-QT.uml.imports = $$QT_MODULE_IMPORT_BASE
-QT.uml.depends = core modeling
-
-QT.uml.DEFINES = QT_UML_LIB
-QT_CONFIG += uml
diff --git a/src/duse/duse.pro b/src/duse/duse.pro
index ae32822f..5b37e449 100644
--- a/src/duse/duse.pro
+++ b/src/duse/duse.pro
@@ -3,6 +3,8 @@ load(qt_build_config)
 TARGET = QtDuse
 QT = core-private modeling-private uml
 
+MODULE_PLUGIN_TYPES = metamodels/libqdusemetamodel.so
+
 QMAKE_DOCS = $$PWD/doc/qtduse.qdocconf
 
 load(qt_module)
diff --git a/src/mof/mof.pro b/src/mof/mof.pro
index 38fbf943..8a8c9dcd 100644
--- a/src/mof/mof.pro
+++ b/src/mof/mof.pro
@@ -3,10 +3,12 @@ load(qt_build_config)
 TARGET = QtMof
 QT = core-private modeling-private
 
+MODULE_PLUGIN_TYPES = metamodels/libqmofmetamodel.so
+
 QMAKE_DOCS = $$PWD/doc/qtmof.qdocconf
 
 load(qt_module)
 
 include(mof.pri)
 
-HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
\ No newline at end of file
+HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
diff --git a/src/plugins/metamodels/metamodels.pro b/src/plugins/metamodels/metamodels.pro
index 4e3ac004..a546ae2c 100644
--- a/src/plugins/metamodels/metamodels.pro
+++ b/src/plugins/metamodels/metamodels.pro
@@ -1,3 +1,6 @@
 TEMPLATE = subdirs
 
-SUBDIRS = mof uml saduseprofile duse
+qtHaveModule(uml): SUBDIRS += uml
+qtHaveModule(mof): SUBDIRS += mof
+qtHaveModule(duse): SUBDIRS += duse
+qtHaveModule(saduseprofile): SUBDIRS += saduseprofile
diff --git a/src/saduseprofile/saduseprofile.pro b/src/saduseprofile/saduseprofile.pro
index 65d4b552..954d96ba 100644
--- a/src/saduseprofile/saduseprofile.pro
+++ b/src/saduseprofile/saduseprofile.pro
@@ -3,6 +3,8 @@ load(qt_build_config)
 TARGET = QtSADuseProfile
 QT = core-private modeling-private uml
 
+MODULE_PLUGIN_TYPES = metamodels/libqsaduseprofilemetamodel.so
+
 QMAKE_DOCS = $$PWD/doc/qtsaduseprofile.qdocconf
 
 load(qt_module)
diff --git a/src/uml/uml.pro b/src/uml/uml.pro
index d5611a29..7ed7f77f 100644
--- a/src/uml/uml.pro
+++ b/src/uml/uml.pro
@@ -3,10 +3,12 @@ load(qt_build_config)
 TARGET = QtUml
 QT = core-private modeling-private
 
+MODULE_PLUGIN_TYPES = metamodels/libqumlmetamodel.so
+
 QMAKE_DOCS = $$PWD/doc/qtuml.qdocconf
 
 load(qt_module)
 
 include(uml.pri)
 
-HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
\ No newline at end of file
+HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS