4 files changed, 19 insertions, 28 deletions
diff --git a/examples/wayland/multi-output/multi-output.pro b/examples/wayland/multi-output/multi-output.pro
index 954fe15fb..db86d4008 100644
--- a/examples/wayland/multi-output/multi-output.pro
+++ b/examples/wayland/multi-output/multi-output.pro
@@ -1,4 +1,4 @@
-QT += core-private gui-private quick-private
+QT += core gui qml
 
 SOURCES += \
     main.cpp
@@ -11,10 +11,3 @@ OTHER_FILES = \
     images/background.jpg \
 
 RESOURCES += multi-output.qrc
-
-CONFIG += link_pkgconfig
-PKGCONFIG += wayland-server
-LIBS += -lwayland-server
-
-
-DEFINES += QT_COMPOSITOR_QUICK
diff --git a/examples/wayland/pure-qml/pure-qml.pro b/examples/wayland/pure-qml/pure-qml.pro
index 02bf68b92..5dab0d767 100644
--- a/examples/wayland/pure-qml/pure-qml.pro
+++ b/examples/wayland/pure-qml/pure-qml.pro
@@ -1,4 +1,4 @@
-QT += core-private gui-private quick-private
+QT += gui qml
 
 SOURCES += \
     main.cpp
@@ -10,10 +10,3 @@ OTHER_FILES = \
     images/background.jpg \
 
 RESOURCES += pure-qml.qrc
-
-CONFIG += link_pkgconfig
-PKGCONFIG += wayland-server
-LIBS += -lwayland-server
-
-
-DEFINES += QT_COMPOSITOR_QUICK
diff --git a/examples/wayland/server-buffer/client/client.pro b/examples/wayland/server-buffer/client/client.pro
index ce4a04f91..6c2c92857 100644
--- a/examples/wayland/server-buffer/client/client.pro
+++ b/examples/wayland/server-buffer/client/client.pro
@@ -3,8 +3,13 @@ TARGET = client
 INCLUDEPATH += .
 
 QT += waylandclient-private
-CONFIG += link_pkgconfig
-PKGCONFIG += wayland-client
+
+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 a01b6faed..f391d3a1b 100644
--- a/examples/wayland/server-buffer/compositor/compositor.pro
+++ b/examples/wayland/server-buffer/compositor/compositor.pro
@@ -1,23 +1,23 @@
 QT += core-private gui-private quick-private waylandcompositor-private
 
-LIBS += -lwayland-server
+contains(QT_CONFIG, no-pkg-config) {
+    LIBS += -lwayland-server
+} else {
+    CONFIG += link_pkgconfig
+    PKGCONFIG += wayland-server
+}
 
 SOURCES += \
     main.cpp \
     serverbufferitem.cpp
+
 HEADERS += \
-    serverbufferitem.h \
+    serverbufferitem.h
 
 OTHER_FILES = \
-    qml/main.qml \
-    images/background.jpg \
+    images/background.jpg
 
 RESOURCES += compositor.qrc
 
-CONFIG +=wayland-scanner
+CONFIG += wayland-scanner
 WAYLANDSERVERSOURCES += ../share-buffer.xml
-
-CONFIG += link_pkgconfig
-PKGCONFIG += wayland-server
-
-DEFINES += QT_COMPOSITOR_QUICK