auto-generate module pris

this changes the library defines (*QT3D* => *3D*). i don't expect anyone
to actually use them, so this should go without notice.

Change-Id: Iae9bdead552325127fe78ae4054f5e8f8577ac40
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>

5 files changed, 8 insertions, 44 deletions

diff --git a/modules/qt_qt3d.pri b/modules/qt_qt3d.pri
deleted file mode 100644
index 2c7d2308e..000000000
--- a/modules/qt_qt3d.pri
+++ /dev/null
@@ -1,17 +0,0 @@
-QT.3d.VERSION = 5.0.0
-QT.3d.MAJOR_VERSION = 5
-QT.3d.MINOR_VERSION = 0
-QT.3d.PATCH_VERSION = 0
-
-QT.3d.name = Qt3D
-QT.3d.bins = $$QT_MODULE_BIN_BASE
-QT.3d.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/Qt3D
-QT.3d.private_includes = $$QT_MODULE_INCLUDE_BASE/Qt3D/$$QT.3d.VERSION
-QT.3d.sources = $$QT_MODULE_BASE/src/threed
-QT.3d.libs = $$QT_MODULE_LIB_BASE
-QT.3d.plugins = $$QT_MODULE_PLUGIN_BASE
-QT.3d.imports = $$QT_MODULE_IMPORT_BASE
-QT.3d.depends = gui
-QT.3d.DEFINES = QT_QT3D_LIB
-
-QT_CONFIG += 3d
diff --git a/modules/qt_qt3dquick.pri b/modules/qt_qt3dquick.pri
deleted file mode 100644
index fd2fb7867..000000000
--- a/modules/qt_qt3dquick.pri
+++ /dev/null
@@ -1,17 +0,0 @@
-QT.3dquick.VERSION = 5.0.0
-QT.3dquick.MAJOR_VERSION = 5
-QT.3dquick.MINOR_VERSION = 0
-QT.3dquick.PATCH_VERSION = 0
-
-QT.3dquick.name = Qt3DQuick
-QT.3dquick.bins = $$QT_MODULE_BIN_BASE
-QT.3dquick.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/Qt3DQuick
-QT.3dquick.private_includes = $$QT_MODULE_INCLUDE_BASE/QtSensors/$$QT.quick3d.VERSION
-QT.3dquick.sources = $$QT_MODULE_BASE/src/quick3d
-QT.3dquick.libs = $$QT_MODULE_LIB_BASE
-QT.3dquick.plugins = $$QT_MODULE_PLUGIN_BASE
-QT.3dquick.imports = $$QT_MODULE_IMPORT_BASE
-QT.3dquick.depends = gui quick qml network
-QT.3dquick.DEFINES = QT_QT3DQUICK_LIB
-
-QT_CONFIG += 3dquick
diff --git a/src/quick3d/quick3d.pro b/src/quick3d/quick3d.pro
index e3d4de840..18ca5b350 100644
--- a/src/quick3d/quick3d.pro
+++ b/src/quick3d/quick3d.pro
@@ -2,13 +2,14 @@ load(qt_module)
 
 TARGET     = Qt3DQuick
 MODULE     = 3dquick
-QT         = core gui network qml quick 3d
-
 CONFIG += module
-MODULE_PRI = ../../modules/qt_qt3dquick.pri
+QT         = core gui qml quick 3d
 
 load(qt_module_config)
 
+# private dependencies
+QT += network
+
 gcov {
     CONFIG += staticlib warn_on
     QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage
diff --git a/src/threed/threed.pro b/src/threed/threed.pro
index e6eb3a601..afb90fe10 100644
--- a/src/threed/threed.pro
+++ b/src/threed/threed.pro
@@ -2,13 +2,14 @@ load(qt_module)
 
 TARGET     = Qt3D
 MODULE     = 3d
-QT         = core-private gui-private network
-
 CONFIG += module
-MODULE_PRI = ../../modules/qt_qt3d.pri
+QT         = core-private gui-private
 
 load(qt_module_config)
 
+# private dependencies
+QT += network
+
 gcov {
     CONFIG += staticlib warn_on
     QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage
diff --git a/sync.profile b/sync.profile
index 8bf1534e0..3da585e6e 100644
--- a/sync.profile
+++ b/sync.profile
@@ -15,10 +15,6 @@
     "quick" => "#include <QtQuick/QQuick>\n",
     "network" => "#include <QtNetwork/QtNetwork>\n"
 );
-%modulepris = (
-    "Qt3D" => "$basedir/modules/qt_qt3d.pri",
-    "Qt3DQuick" => "$basedir/modules/qt_qt3dquick.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: