diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-12 11:26:46 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-27 08:32:01 +0200 |
| commit | 0a35f98e2c120ec5253622e1f21982393e80b86e (patch) | |
| tree | 62676d10d1d3160f17f2e476b4e876d9779ac9c6 | |
| parent | 39c3919fa6c8f8aa11f3ffe8ba8e0d1a2b819cc6 (diff) | |
auto-generate module pris
Change-Id: I4f5c243d01f1b00f7cced6487dd4a5fa4fb072e4
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| -rw-r--r-- | modules/qt_compositor.pri | 19 | ||||
| -rw-r--r-- | src/compositor/compositor.pri | 3 | ||||
| -rw-r--r-- | src/compositor/compositor.pro | 7 | ||||
| -rw-r--r-- | sync.profile | 3 |
4 files changed, 5 insertions, 27 deletions
diff --git a/modules/qt_compositor.pri b/modules/qt_compositor.pri deleted file mode 100644 index eb6af778d..000000000 --- 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 d13391344..fa8adfb14 100644 --- 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 850e350dd..0f2303610 100644 --- 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 d20e7fb83..7dd55e3df 100644 --- 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. |