diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-11-03 15:14:47 +0100 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2016-11-23 06:50:34 +0000 |
| commit | 1d5b44cbb1e834bc8db94d8ec1ac140b8ca9ed37 (patch) | |
| tree | 12206741f269aef8d45a8f8165919347dd359d0d /src/compositor/compositor.pro | |
| parent | c445cf7d4e517248013e707a5050f9e0408a2746 (diff) | |
Move qtwayland over to use the new configuration system
Re-use configuration results from qtbase where possible and move
all pkg-config handling over to be done at configuration time.
Since waylandclient and waylandcompositor are two independent libs,
this required some duplication of features and libraries used by
both in the configure.json files.
Change-Id: I1f3ec56c85cb780324cc7634a3ad7951125853a0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'src/compositor/compositor.pro')
| -rw-r--r-- | src/compositor/compositor.pro | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/compositor/compositor.pro b/src/compositor/compositor.pro index 251d757e2..935fc2527 100644 --- a/src/compositor/compositor.pro +++ b/src/compositor/compositor.pro @@ -5,19 +5,14 @@ QT = core gui-private qtHaveModule(quick): QT += quick -contains(QT_CONFIG, opengl):MODULE_DEFINES = QT_WAYLAND_COMPOSITOR_GL +qtConfig(opengl):MODULE_DEFINES = QT_WAYLAND_COMPOSITOR_GL CONFIG -= precompile_header CONFIG += link_pkgconfig -DEFINES += QT_WAYLAND_WINDOWMANAGER_SUPPORT QMAKE_DOCS = $$PWD/doc/qtwaylandcompositor.qdocconf -!contains(QT_CONFIG, no-pkg-config) { - PKGCONFIG_PRIVATE += wayland-server -} else { - LIBS += -lwayland-server -} +QMAKE_USE += wayland-server INCLUDEPATH += ../shared |