Move examples into wayland subdirectory.v5.4.0-beta1

Conforming to the Qt project directory structure.
Change-Id: I452867fabc88e9594fa26f944b5d3e1ca4ffc720
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>

36 files changed, 19 insertions, 17 deletions

diff --git a/examples/examples.pro b/examples/examples.pro
index d633fb924..24350f359 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,13 +1,2 @@
-TEMPLATE=subdirs
-
-#Only build compositor examples if we are building
-#the QtCompositor API
-contains(CONFIG, wayland-compositor) {
-    SUBDIRS += qwindow-compositor
-
-    qtHaveModule(quick) {
-        SUBDIRS += qml-compositor
-    }
-
-    SUBDIRS += server-buffer
-}
+TEMPLATE = subdirs
+SUBDIRS += wayland
diff --git a/examples/qml-compositor/ContrastEffect.qml b/examples/wayland/qml-compositor/ContrastEffect.qml
index c284b2907..c284b2907 100644
--- a/examples/qml-compositor/ContrastEffect.qml
+++ b/examples/wayland/qml-compositor/ContrastEffect.qml
diff --git a/examples/qml-compositor/WindowChrome.qml b/examples/wayland/qml-compositor/WindowChrome.qml
index fe9f5d78d..fe9f5d78d 100644
--- a/examples/qml-compositor/WindowChrome.qml
+++ b/examples/wayland/qml-compositor/WindowChrome.qml
diff --git a/examples/qml-compositor/WindowContainer.qml b/examples/wayland/qml-compositor/WindowContainer.qml
index 5e073298f..5e073298f 100644
--- a/examples/qml-compositor/WindowContainer.qml
+++ b/examples/wayland/qml-compositor/WindowContainer.qml
diff --git a/examples/qml-compositor/background.jpg b/examples/wayland/qml-compositor/background.jpg
index 445567fbd..445567fbd 100644
--- a/examples/qml-compositor/background.jpg
+++ b/examples/wayland/qml-compositor/background.jpg
diff --git a/examples/qml-compositor/closebutton.png b/examples/wayland/qml-compositor/closebutton.png
index 5b5616e98..5b5616e98 100644
--- a/examples/qml-compositor/closebutton.png
+++ b/examples/wayland/qml-compositor/closebutton.png
diff --git a/examples/qml-compositor/compositor.js b/examples/wayland/qml-compositor/compositor.js
index f24d849c1..f24d849c1 100644
--- a/examples/qml-compositor/compositor.js
+++ b/examples/wayland/qml-compositor/compositor.js
diff --git a/examples/qml-compositor/main.cpp b/examples/wayland/qml-compositor/main.cpp
index 26e730d43..26e730d43 100644
--- a/examples/qml-compositor/main.cpp
+++ b/examples/wayland/qml-compositor/main.cpp
diff --git a/examples/qml-compositor/main.qml b/examples/wayland/qml-compositor/main.qml
index a6b54c312..a6b54c312 100644
--- a/examples/qml-compositor/main.qml
+++ b/examples/wayland/qml-compositor/main.qml
diff --git a/examples/qml-compositor/qml-compositor.pro b/examples/wayland/qml-compositor/qml-compositor.pro
index e397002c3..f908a2f2f 100644
--- a/examples/qml-compositor/qml-compositor.pro
+++ b/examples/wayland/qml-compositor/qml-compositor.pro
@@ -16,7 +16,7 @@ SOURCES += main.cpp
 
 OTHER_FILES = ContrastEffect.qml  main.qml  WindowChrome.qml  WindowContainer.qml background.jpg closebutton.png compositor.js
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtwayland/qml-compositor
+target.path = $$[QT_INSTALL_EXAMPLES]/wayland/qml-compositor
 sources.files = $$OTHER_FILES $$SOURCES $$HEADERS $$RESOURCES $$FORMS qml-compositor.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtwayland/qml-compositor
+sources.path = $$[QT_INSTALL_EXAMPLES]/wayland/qml-compositor
 INSTALLS += target sources
diff --git a/examples/qwindow-compositor/compositorwindow.cpp b/examples/wayland/qwindow-compositor/compositorwindow.cpp
index 6f8f2321d..6f8f2321d 100644
--- a/examples/qwindow-compositor/compositorwindow.cpp
+++ b/examples/wayland/qwindow-compositor/compositorwindow.cpp
diff --git a/examples/qwindow-compositor/compositorwindow.h b/examples/wayland/qwindow-compositor/compositorwindow.h
index dc87b31a3..dc87b31a3 100644
--- a/examples/qwindow-compositor/compositorwindow.h
+++ b/examples/wayland/qwindow-compositor/compositorwindow.h
diff --git a/examples/qwindow-compositor/main.cpp b/examples/wayland/qwindow-compositor/main.cpp
index a0288982e..a0288982e 100644
--- a/examples/qwindow-compositor/main.cpp
+++ b/examples/wayland/qwindow-compositor/main.cpp
diff --git a/examples/qwindow-compositor/qwindow-compositor.pro b/examples/wayland/qwindow-compositor/qwindow-compositor.pro
index 7b0e24c43..4bab000b5 100644
--- a/examples/qwindow-compositor/qwindow-compositor.pro
+++ b/examples/wayland/qwindow-compositor/qwindow-compositor.pro
@@ -23,7 +23,7 @@ INCLUDEPATH += $$PWD/../../include
 
 RESOURCES += qwindow-compositor.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtwayland/qwindow-compositor
+target.path = $$[QT_INSTALL_EXAMPLES]/wayland/qwindow-compositor
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qwindow-compositor.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtwayland/qwindow-compositor
+sources.path = $$[QT_INSTALL_EXAMPLES]/wayland/qwindow-compositor
 INSTALLS += target sources
diff --git a/examples/qwindow-compositor/qwindow-compositor.qrc b/examples/wayland/qwindow-compositor/qwindow-compositor.qrc
index 20dd10a53..20dd10a53 100644
--- a/examples/qwindow-compositor/qwindow-compositor.qrc
+++ b/examples/wayland/qwindow-compositor/qwindow-compositor.qrc
diff --git a/examples/qwindow-compositor/qwindowcompositor.cpp b/examples/wayland/qwindow-compositor/qwindowcompositor.cpp
index c933152d8..c933152d8 100644
--- a/examples/qwindow-compositor/qwindowcompositor.cpp
+++ b/examples/wayland/qwindow-compositor/qwindowcompositor.cpp
diff --git a/examples/qwindow-compositor/qwindowcompositor.h b/examples/wayland/qwindow-compositor/qwindowcompositor.h
index 57f3e8536..57f3e8536 100644
--- a/examples/qwindow-compositor/qwindowcompositor.h
+++ b/examples/wayland/qwindow-compositor/qwindowcompositor.h
diff --git a/examples/qwindow-compositor/textureblitter.cpp b/examples/wayland/qwindow-compositor/textureblitter.cpp
index 813fd8966..813fd8966 100644
--- a/examples/qwindow-compositor/textureblitter.cpp
+++ b/examples/wayland/qwindow-compositor/textureblitter.cpp
diff --git a/examples/qwindow-compositor/textureblitter.h b/examples/wayland/qwindow-compositor/textureblitter.h
index 7426c6f29..7426c6f29 100644
--- a/examples/qwindow-compositor/textureblitter.h
+++ b/examples/wayland/qwindow-compositor/textureblitter.h
diff --git a/examples/server-buffer/README b/examples/wayland/server-buffer/README
index 762db4238..762db4238 100644
--- a/examples/server-buffer/README
+++ b/examples/wayland/server-buffer/README
diff --git a/examples/server-buffer/client/client.pro b/examples/wayland/server-buffer/client/client.pro
index ce4a04f91..ce4a04f91 100644
--- a/examples/server-buffer/client/client.pro
+++ b/examples/wayland/server-buffer/client/client.pro
diff --git a/examples/server-buffer/client/main.cpp b/examples/wayland/server-buffer/client/main.cpp
index 54c586ce6..54c586ce6 100644
--- a/examples/server-buffer/client/main.cpp
+++ b/examples/wayland/server-buffer/client/main.cpp
diff --git a/examples/server-buffer/client/serverbufferrenderer.cpp b/examples/wayland/server-buffer/client/serverbufferrenderer.cpp
index 2f0d204d3..2f0d204d3 100644
--- a/examples/server-buffer/client/serverbufferrenderer.cpp
+++ b/examples/wayland/server-buffer/client/serverbufferrenderer.cpp
diff --git a/examples/server-buffer/client/serverbufferrenderer.h b/examples/wayland/server-buffer/client/serverbufferrenderer.h
index 7e8999b1c..7e8999b1c 100644
--- a/examples/server-buffer/client/serverbufferrenderer.h
+++ b/examples/wayland/server-buffer/client/serverbufferrenderer.h
diff --git a/examples/server-buffer/compositor/compositor.pro b/examples/wayland/server-buffer/compositor/compositor.pro
index 9f7751a09..9f7751a09 100644
--- a/examples/server-buffer/compositor/compositor.pro
+++ b/examples/wayland/server-buffer/compositor/compositor.pro
diff --git a/examples/server-buffer/compositor/compositor.qrc b/examples/wayland/server-buffer/compositor/compositor.qrc
index dbbbfb1cf..dbbbfb1cf 100644
--- a/examples/server-buffer/compositor/compositor.qrc
+++ b/examples/wayland/server-buffer/compositor/compositor.qrc
diff --git a/examples/server-buffer/compositor/images/background.jpg b/examples/wayland/server-buffer/compositor/images/background.jpg
index 445567fbd..445567fbd 100644
--- a/examples/server-buffer/compositor/images/background.jpg
+++ b/examples/wayland/server-buffer/compositor/images/background.jpg
diff --git a/examples/server-buffer/compositor/main.cpp b/examples/wayland/server-buffer/compositor/main.cpp
index 9f86539fd..9f86539fd 100644
--- a/examples/server-buffer/compositor/main.cpp
+++ b/examples/wayland/server-buffer/compositor/main.cpp
diff --git a/examples/server-buffer/compositor/qml/ServerBufferContainer.qml b/examples/wayland/server-buffer/compositor/qml/ServerBufferContainer.qml
index 7c7306e36..7c7306e36 100644
--- a/examples/server-buffer/compositor/qml/ServerBufferContainer.qml
+++ b/examples/wayland/server-buffer/compositor/qml/ServerBufferContainer.qml
diff --git a/examples/server-buffer/compositor/qml/main.qml b/examples/wayland/server-buffer/compositor/qml/main.qml
index c9d62be55..c9d62be55 100644
--- a/examples/server-buffer/compositor/qml/main.qml
+++ b/examples/wayland/server-buffer/compositor/qml/main.qml
diff --git a/examples/server-buffer/compositor/serverbufferitem.cpp b/examples/wayland/server-buffer/compositor/serverbufferitem.cpp
index 4a47c279d..4a47c279d 100644
--- a/examples/server-buffer/compositor/serverbufferitem.cpp
+++ b/examples/wayland/server-buffer/compositor/serverbufferitem.cpp
diff --git a/examples/server-buffer/compositor/serverbufferitem.h b/examples/wayland/server-buffer/compositor/serverbufferitem.h
index 31fad4e86..31fad4e86 100644
--- a/examples/server-buffer/compositor/serverbufferitem.h
+++ b/examples/wayland/server-buffer/compositor/serverbufferitem.h
diff --git a/examples/server-buffer/compositor/serverbuffertextureprovider.h b/examples/wayland/server-buffer/compositor/serverbuffertextureprovider.h
index 76ff5a4ac..76ff5a4ac 100644
--- a/examples/server-buffer/compositor/serverbuffertextureprovider.h
+++ b/examples/wayland/server-buffer/compositor/serverbuffertextureprovider.h
diff --git a/examples/server-buffer/server-buffer.pro b/examples/wayland/server-buffer/server-buffer.pro
index 16c556251..16c556251 100644
--- a/examples/server-buffer/server-buffer.pro
+++ b/examples/wayland/server-buffer/server-buffer.pro
diff --git a/examples/server-buffer/share-buffer.xml b/examples/wayland/server-buffer/share-buffer.xml
index 57a1fd2c5..57a1fd2c5 100644
--- a/examples/server-buffer/share-buffer.xml
+++ b/examples/wayland/server-buffer/share-buffer.xml
diff --git a/examples/wayland/wayland.pro b/examples/wayland/wayland.pro
new file mode 100644
index 000000000..d633fb924
--- /dev/null
+++ b/examples/wayland/wayland.pro
@@ -0,0 +1,13 @@
+TEMPLATE=subdirs
+
+#Only build compositor examples if we are building
+#the QtCompositor API
+contains(CONFIG, wayland-compositor) {
+    SUBDIRS += qwindow-compositor
+
+    qtHaveModule(quick) {
+        SUBDIRS += qml-compositor
+    }
+
+    SUBDIRS += server-buffer
+}