From 0a35f98e2c120ec5253622e1f21982393e80b86e Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 12 Apr 2012 11:26:46 +0200 Subject: auto-generate module pris Change-Id: I4f5c243d01f1b00f7cced6487dd4a5fa4fb072e4 Reviewed-by: Joerg Bornemann --- src/compositor/compositor.pri | 3 --- src/compositor/compositor.pro | 7 +++++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src') 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) -- cgit v1.2.3