summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-04-12 11:26:46 +0200
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-06-27 08:32:01 +0200
commit0a35f98e2c120ec5253622e1f21982393e80b86e (patch)
tree62676d10d1d3160f17f2e476b4e876d9779ac9c6 /src
parent39c3919fa6c8f8aa11f3ffe8ba8e0d1a2b819cc6 (diff)
auto-generate module pris
Change-Id: I4f5c243d01f1b00f7cced6487dd4a5fa4fb072e4 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/compositor/compositor.pri3
-rw-r--r--src/compositor/compositor.pro7
2 files changed, 5 insertions, 5 deletions
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)