diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-12 12:44:43 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-27 08:32:14 +0200 |
| commit | 41ce17eb1486996d8357d268050a18bc9ac38ad9 (patch) | |
| tree | 048d01f1f5d8f7b158b530dd55ee4c099b0b9675 /src/compositor | |
| parent | 5d7e56377d3330eb9afacd3bac95573a4c6f3716 (diff) | |
build system cleanups
- load(qt_module) => load(qt_build_config)
- remove:
- CONFIG+=module (obsolete)
- code relating to module version headers (automated now)
- %mastercontent assignment (automated now)
- QT_BUILD_*_LIB defines (automated now)
- pointless QPRO_PWD assignments
- qmake -project boilerplate
- dead code
Change-Id: Ia515c3cc40170e3b99b0bfd04c10637d49f9b99f
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'src/compositor')
| -rw-r--r-- | src/compositor/compositor.pri | 6 | ||||
| -rw-r--r-- | src/compositor/compositor.pro | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/compositor/compositor.pri b/src/compositor/compositor.pri index fa8adfb14..595bbf7c7 100644 --- a/src/compositor/compositor.pri +++ b/src/compositor/compositor.pri @@ -1,8 +1,6 @@ -CONFIG += module link_pkgconfig +CONFIG += link_pkgconfig -INCLUDEPATH += $$PWD DEFINES += QT_WAYLAND_WINDOWMANAGER_SUPPORT -DEFINES += QT_BUILD_COMPOSITOR_LIB !contains(QT_CONFIG, no-pkg-config) { PKGCONFIG += wayland-server @@ -10,8 +8,6 @@ DEFINES += QT_BUILD_COMPOSITOR_LIB LIBS += -lwayland-server } -HEADERS += qtcompositorversion.h - include ($$PWD/global/global.pri) include ($$PWD/wayland_wrapper/wayland_wrapper.pri) include ($$PWD/hardware_integration/hardware_integration.pri) diff --git a/src/compositor/compositor.pro b/src/compositor/compositor.pro index 0f2303610..52edb4c69 100644 --- a/src/compositor/compositor.pro +++ b/src/compositor/compositor.pro @@ -1,8 +1,6 @@ -load(qt_module) +load(qt_build_config) TARGET = QtCompositor -QPRO_PWD = $$PWD - QT = core gui-private contains(QT_CONFIG, opengl):MODULE_DEFINES = QT_COMPOSITOR_WAYLAND_GL |