diff options
-rw-r--r-- | examples/examples.pro | 15 | ||||
-rw-r--r-- | examples/wayland/qml-compositor/ContrastEffect.qml (renamed from examples/qml-compositor/ContrastEffect.qml) | 0 | ||||
-rw-r--r-- | examples/wayland/qml-compositor/WindowChrome.qml (renamed from examples/qml-compositor/WindowChrome.qml) | 0 | ||||
-rw-r--r-- | examples/wayland/qml-compositor/WindowContainer.qml (renamed from examples/qml-compositor/WindowContainer.qml) | 0 | ||||
-rw-r--r-- | examples/wayland/qml-compositor/background.jpg (renamed from examples/qml-compositor/background.jpg) | bin | 30730 -> 30730 bytes | |||
-rw-r--r-- | examples/wayland/qml-compositor/closebutton.png (renamed from examples/qml-compositor/closebutton.png) | bin | 25957 -> 25957 bytes | |||
-rw-r--r-- | examples/wayland/qml-compositor/compositor.js (renamed from examples/qml-compositor/compositor.js) | 0 | ||||
-rw-r--r-- | examples/wayland/qml-compositor/main.cpp (renamed from examples/qml-compositor/main.cpp) | 0 | ||||
-rw-r--r-- | examples/wayland/qml-compositor/main.qml (renamed from examples/qml-compositor/main.qml) | 0 | ||||
-rw-r--r-- | examples/wayland/qml-compositor/qml-compositor.pro (renamed from examples/qml-compositor/qml-compositor.pro) | 4 | ||||
-rw-r--r-- | examples/wayland/qwindow-compositor/compositorwindow.cpp (renamed from examples/qwindow-compositor/compositorwindow.cpp) | 0 | ||||
-rw-r--r-- | examples/wayland/qwindow-compositor/compositorwindow.h (renamed from examples/qwindow-compositor/compositorwindow.h) | 0 | ||||
-rw-r--r-- | examples/wayland/qwindow-compositor/main.cpp (renamed from examples/qwindow-compositor/main.cpp) | 0 | ||||
-rw-r--r-- | examples/wayland/qwindow-compositor/qwindow-compositor.pro (renamed from examples/qwindow-compositor/qwindow-compositor.pro) | 4 | ||||
-rw-r--r-- | examples/wayland/qwindow-compositor/qwindow-compositor.qrc (renamed from examples/qwindow-compositor/qwindow-compositor.qrc) | 0 | ||||
-rw-r--r-- | examples/wayland/qwindow-compositor/qwindowcompositor.cpp (renamed from examples/qwindow-compositor/qwindowcompositor.cpp) | 0 | ||||
-rw-r--r-- | examples/wayland/qwindow-compositor/qwindowcompositor.h (renamed from examples/qwindow-compositor/qwindowcompositor.h) | 0 | ||||
-rw-r--r-- | examples/wayland/qwindow-compositor/textureblitter.cpp (renamed from examples/qwindow-compositor/textureblitter.cpp) | 0 | ||||
-rw-r--r-- | examples/wayland/qwindow-compositor/textureblitter.h (renamed from examples/qwindow-compositor/textureblitter.h) | 0 | ||||
-rw-r--r-- | examples/wayland/server-buffer/README (renamed from examples/server-buffer/README) | 0 | ||||
-rw-r--r-- | examples/wayland/server-buffer/client/client.pro (renamed from examples/server-buffer/client/client.pro) | 0 | ||||
-rw-r--r-- | examples/wayland/server-buffer/client/main.cpp (renamed from examples/server-buffer/client/main.cpp) | 0 | ||||
-rw-r--r-- | examples/wayland/server-buffer/client/serverbufferrenderer.cpp (renamed from examples/server-buffer/client/serverbufferrenderer.cpp) | 0 | ||||
-rw-r--r-- | examples/wayland/server-buffer/client/serverbufferrenderer.h (renamed from examples/server-buffer/client/serverbufferrenderer.h) | 0 | ||||
-rw-r--r-- | examples/wayland/server-buffer/compositor/compositor.pro (renamed from examples/server-buffer/compositor/compositor.pro) | 0 | ||||
-rw-r--r-- | examples/wayland/server-buffer/compositor/compositor.qrc (renamed from examples/server-buffer/compositor/compositor.qrc) | 0 | ||||
-rw-r--r-- | examples/wayland/server-buffer/compositor/images/background.jpg (renamed from examples/server-buffer/compositor/images/background.jpg) | bin | 30730 -> 30730 bytes | |||
-rw-r--r-- | examples/wayland/server-buffer/compositor/main.cpp (renamed from examples/server-buffer/compositor/main.cpp) | 0 | ||||
-rw-r--r-- | examples/wayland/server-buffer/compositor/qml/ServerBufferContainer.qml (renamed from examples/server-buffer/compositor/qml/ServerBufferContainer.qml) | 0 | ||||
-rw-r--r-- | examples/wayland/server-buffer/compositor/qml/main.qml (renamed from examples/server-buffer/compositor/qml/main.qml) | 0 | ||||
-rw-r--r-- | examples/wayland/server-buffer/compositor/serverbufferitem.cpp (renamed from examples/server-buffer/compositor/serverbufferitem.cpp) | 0 | ||||
-rw-r--r-- | examples/wayland/server-buffer/compositor/serverbufferitem.h (renamed from examples/server-buffer/compositor/serverbufferitem.h) | 0 | ||||
-rw-r--r-- | examples/wayland/server-buffer/compositor/serverbuffertextureprovider.h (renamed from examples/server-buffer/compositor/serverbuffertextureprovider.h) | 0 | ||||
-rw-r--r-- | examples/wayland/server-buffer/server-buffer.pro (renamed from examples/server-buffer/server-buffer.pro) | 0 | ||||
-rw-r--r-- | examples/wayland/server-buffer/share-buffer.xml (renamed from examples/server-buffer/share-buffer.xml) | 0 | ||||
-rw-r--r-- | examples/wayland/wayland.pro | 13 |
36 files changed, 19 insertions, 17 deletions
diff --git a/examples/examples.pro b/examples/examples.pro index d633fb92..24350f35 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 c284b290..c284b290 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 fe9f5d78..fe9f5d78 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 5e073298..5e073298 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 Binary files differindex 445567fb..445567fb 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 Binary files differindex 5b5616e9..5b5616e9 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 f24d849c..f24d849c 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 26e730d4..26e730d4 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 a6b54c31..a6b54c31 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 e397002c..f908a2f2 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 6f8f2321..6f8f2321 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 dc87b31a..dc87b31a 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 a0288982..a0288982 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 7b0e24c4..4bab000b 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 20dd10a5..20dd10a5 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 c933152d..c933152d 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 57f3e853..57f3e853 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 813fd896..813fd896 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 7426c6f2..7426c6f2 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 762db423..762db423 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 ce4a04f9..ce4a04f9 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 54c586ce..54c586ce 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 2f0d204d..2f0d204d 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 7e8999b1..7e8999b1 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 9f7751a0..9f7751a0 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 dbbbfb1c..dbbbfb1c 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 Binary files differindex 445567fb..445567fb 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 9f86539f..9f86539f 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 7c7306e3..7c7306e3 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 c9d62be5..c9d62be5 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 4a47c279..4a47c279 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 31fad4e8..31fad4e8 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 76ff5a4a..76ff5a4a 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 16c55625..16c55625 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 57a1fd2c..57a1fd2c 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 00000000..d633fb92 --- /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 +} |