auto-generate module pris

Change-Id: I4f5c243d01f1b00f7cced6487dd4a5fa4fb072e4
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>

diff --git a/modules/qt_compositor.pri b/modules/qt_compositor.pri
deleted file mode 100644 (file)
index eb6af77..0000000
--- a/modules/qt_compositor.pri
+++ /dev/null
@@ -1,19 +0,0 @@
-QT.compositor.VERSION = 5.0.0
-QT.compositor.MAJOR_VERSION = 5
-QT.compositor.MINOR_VERSION = 0
-QT.compositor.PATCH_VERSION = 0
-
-QT.compositor.name = QtCompositor
-QT.compositor.bins = $$QT_MODULE_BIN_BASE
-QT.compositor.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtCompositor
-QT.compositor.private_includes = $$QT_MODULE_INCLUDE_BASE/QtCompositor/$$QT.compositor.VERSION
-QT.compositor.sources = $$QT_MODULE_BASE/src/compositor
-QT.compositor.libs = $$QT_MODULE_LIB_BASE
-QT.compositor.plugins = $$QT_MODULE_PLUGIN_BASE
-QT.compositor.imports = $$QT_MODULE_IMPORT_BASE
-QT.compositor.depends = gui
-contains(QT_CONFIG, opengl) {
-    QT.compositor.DEFINES = QT_COMPOSITOR_WAYLAND_GL
-}
-
-QT_CONFIG += compositor

diff --git a/src/compositor/compositor.pri b/src/compositor/compositor.pri
index d133913..fa8adfb 100644 (file)
--- a/src/compositor/compositor.pri
+++ b/src/compositor/compositor.pri
@@ -1,8 +1,5 @@
 CONFIG += module link_pkgconfig
 
-load(qt_module)
-MODULE_PRI += $$PWD/../../modules/qt_compositor.pri
-
 INCLUDEPATH += $$PWD
 DEFINES += QT_WAYLAND_WINDOWMANAGER_SUPPORT
 DEFINES += QT_BUILD_COMPOSITOR_LIB

diff --git a/src/compositor/compositor.pro b/src/compositor/compositor.pro
index 850e350..0f23036 100644 (file)
--- a/src/compositor/compositor.pro
+++ b/src/compositor/compositor.pro
@@ -3,8 +3,11 @@ load(qt_module)
 TARGET  = QtCompositor
 QPRO_PWD   = $$PWD
 
-include (compositor.pri)
+QT = core gui-private
+
+contains(QT_CONFIG, opengl):MODULE_DEFINES = QT_COMPOSITOR_WAYLAND_GL
+
 load(qt_module_config)
 
-QT += gui-private
+include(compositor.pri)
 

diff --git a/sync.profile b/sync.profile
index d20e7fb..7dd55e3 100644 (file)
--- a/sync.profile
+++ b/sync.profile
@@ -8,9 +8,6 @@
 %mastercontent = (
     "gui" => "#include <QtGui/QtGui>\n",
 );
-%modulepris = (
-    "QtCompositor" => "$basedir/modules/qt_compositor.pri",
-);
 %deprecatedheaders = (
 );
 # Module dependencies.