From 1d5b44cbb1e834bc8db94d8ec1ac140b8ca9ed37 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Thu, 3 Nov 2016 15:14:47 +0100 Subject: 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 Reviewed-by: Paul Olav Tvete --- src/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pri | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pri') diff --git a/src/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pri b/src/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pri index bc072bf05..067378af1 100644 --- a/src/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pri +++ b/src/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pri @@ -1,12 +1,7 @@ INCLUDEPATH += $$PWD include ($$PWD/../xcomposite_share/xcomposite_share.pri) -!contains(QT_CONFIG, no-pkg-config) { - CONFIG += link_pkgconfig - PKGCONFIG += wayland-client xcomposite gl x11 -} else { - LIBS += -lXcomposite -lGL -lX11 -} +QMAKE_USE += wayland-client glx QT += glx_support-private -- cgit v1.2.3