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>

7 files changed, 11 insertions, 55 deletions

diff --git a/examples/wayland/custom-extension/client-common/client.pro b/examples/wayland/custom-extension/client-common/client.pro
index 9ba72bc9c..95b99578a 100644
--- a/examples/wayland/custom-extension/client-common/client.pro
+++ b/examples/wayland/custom-extension/client-common/client.pro
@@ -1,14 +1,7 @@
 CONFIG += wayland-scanner
-CONFIG += link_pkgconfig
-
 TARGET = custom-wayland
 
 QT += waylandclient-private
-!contains(QT_CONFIG, no-pkg-config) {
-    PKGCONFIG += wayland-client
-} else {
-    LIBS += -lwayland-client
-}
 
 WAYLANDCLIENTSOURCES += ../protocol/custom.xml
 
diff --git a/examples/wayland/custom-extension/compositor/compositor.pro b/examples/wayland/custom-extension/compositor/compositor.pro
index 4ffafdb8b..b0ff7b2f7 100644
--- a/examples/wayland/custom-extension/compositor/compositor.pro
+++ b/examples/wayland/custom-extension/compositor/compositor.pro
@@ -18,13 +18,6 @@ WAYLANDSERVERSOURCES += \
 
 RESOURCES += compositor.qrc
 
-contains(QT_CONFIG, no-pkg-config) {
-    LIBS += -lwayland-server
-} else {
-    CONFIG += link_pkgconfig
-    PKGCONFIG += wayland-server
-}
-
 TARGET = custom-compositor
 
 HEADERS += \
diff --git a/examples/wayland/custom-extension/cpp-client/cpp-client.pro b/examples/wayland/custom-extension/cpp-client/cpp-client.pro
index 54fead078..b700f2367 100644
--- a/examples/wayland/custom-extension/cpp-client/cpp-client.pro
+++ b/examples/wayland/custom-extension/cpp-client/cpp-client.pro
@@ -1,17 +1,8 @@
 QT += waylandclient-private gui-private
-
-CONFIG += c++11
 CONFIG += wayland-scanner
-CONFIG += link_pkgconfig
 
 WAYLANDCLIENTSOURCES += ../protocol/custom.xml
 
-!contains(QT_CONFIG, no-pkg-config) {
-    PKGCONFIG += wayland-client
-} else {
-    LIBS += -lwayland-client
-}
-
 SOURCES += main.cpp \
     ../client-common/customextension.cpp
 
diff --git a/examples/wayland/custom-extension/qml-client/qml-client.pro b/examples/wayland/custom-extension/qml-client/qml-client.pro
index aec29d2b3..d45067e5a 100644
--- a/examples/wayland/custom-extension/qml-client/qml-client.pro
+++ b/examples/wayland/custom-extension/qml-client/qml-client.pro
@@ -1,19 +1,9 @@
 TEMPLATE = app
-
 QT += qml quick waylandclient-private
-
-CONFIG += c++11
 CONFIG += wayland-scanner
-CONFIG += link_pkgconfig
 
 WAYLANDCLIENTSOURCES += ../protocol/custom.xml
 
-!contains(QT_CONFIG, no-pkg-config) {
-    PKGCONFIG += wayland-client
-} else {
-    LIBS += -lwayland-client
-}
-
 SOURCES += main.cpp \
     ../client-common/customextension.cpp
 
diff --git a/examples/wayland/server-buffer/client/client.pro b/examples/wayland/server-buffer/client/client.pro
index 6e5cc87e6..459a407a4 100644
--- a/examples/wayland/server-buffer/client/client.pro
+++ b/examples/wayland/server-buffer/client/client.pro
@@ -3,14 +3,6 @@ TARGET = client
 INCLUDEPATH += .
 
 QT += waylandclient-private
-
-contains(QT_CONFIG, no-pkg-config) {
-    LIBS += -lwayland-client
-} else {
-    CONFIG += link_pkgconfig
-    PKGCONFIG += wayland-client
-}
-
 CONFIG += wayland-scanner
 WAYLANDCLIENTSOURCES += ../share-buffer.xml
 
diff --git a/examples/wayland/server-buffer/compositor/compositor.pro b/examples/wayland/server-buffer/compositor/compositor.pro
index 28a781bd0..45240af91 100644
--- a/examples/wayland/server-buffer/compositor/compositor.pro
+++ b/examples/wayland/server-buffer/compositor/compositor.pro
@@ -1,12 +1,5 @@
 QT += core-private gui-private quick-private waylandcompositor-private
 
-contains(QT_CONFIG, no-pkg-config) {
-    LIBS += -lwayland-server
-} else {
-    CONFIG += link_pkgconfig
-    PKGCONFIG += wayland-server
-}
-
 SOURCES += \
     main.cpp \
     serverbufferitem.cpp
diff --git a/examples/wayland/wayland.pro b/examples/wayland/wayland.pro
index 2a5395004..6024dd2dd 100644
--- a/examples/wayland/wayland.pro
+++ b/examples/wayland/wayland.pro
@@ -1,17 +1,21 @@
+requires(qtHaveModule(waylandcompositor))
+requires(qtConfig(opengl))
 TEMPLATE=subdirs
 
-contains(QT_CONFIG, opengl) {
-    SUBDIRS += qwindow-compositor
-    SUBDIRS += minimal-cpp
-}
+SUBDIRS += \
+    qwindow-compositor
+    minimal-cpp
 
-contains(QT_CONFIG, opengl):qtHaveModule(quick) {
+qtHaveModule(quick) {
     SUBDIRS += minimal-qml
     SUBDIRS += spanning-screens
     SUBDIRS += pure-qml
     SUBDIRS += multi-output
     SUBDIRS += multi-screen
-    SUBDIRS += custom-extension
-    SUBDIRS += server-buffer
     SUBDIRS += ivi-compositor
+    qtHaveModule(waylandclient) {
+        SUBDIRS += \
+            custom-extension \
+            server-buffer
+    }
 }