diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:44:24 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:44:24 +0200 |
| commit | d357d744bf58a6148c8ed05a13496d7a8ff84d02 (patch) | |
| tree | 6cdec64af5979deaa6850186cc496c56a92c4146 /examples | |
| parent | 966af2d2d1b1cdaa9cc12ccbed5d3433612a35e6 (diff) | |
| parent | d9132f078bb168a9a013b97493c219596cc8c6b2 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
.qmake.conf
examples/wayland/qml-compositor/qml-compositor.pro
examples/wayland/server-buffer/compositor/compositor.pro
Change-Id: Ie6fa21dfbdb71f33e0a4d29d34a824048cf00864
Diffstat (limited to 'examples')
4 files changed, 12 insertions, 4 deletions
diff --git a/examples/wayland/qwindow-compositor/qwindow-compositor.pro b/examples/wayland/qwindow-compositor/qwindow-compositor.pro index 994276d99..6e23dc820 100644 --- a/examples/wayland/qwindow-compositor/qwindow-compositor.pro +++ b/examples/wayland/qwindow-compositor/qwindow-compositor.pro @@ -17,6 +17,4 @@ INCLUDEPATH += $$PWD/../../include RESOURCES += qwindow-compositor.qrc target.path = $$[QT_INSTALL_EXAMPLES]/wayland/qwindow-compositor -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qwindow-compositor.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/wayland/qwindow-compositor -INSTALLS += target sources +INSTALLS += target diff --git a/examples/wayland/server-buffer/client/client.pro b/examples/wayland/server-buffer/client/client.pro index 6c2c92857..6e5cc87e6 100644 --- a/examples/wayland/server-buffer/client/client.pro +++ b/examples/wayland/server-buffer/client/client.pro @@ -20,3 +20,6 @@ SOURCES += \ HEADERS += \ serverbufferrenderer.h + +target.path = $$[QT_INSTALL_EXAMPLES]/wayland/server-buffer/client +INSTALLS += target diff --git a/examples/wayland/server-buffer/compositor/compositor.pro b/examples/wayland/server-buffer/compositor/compositor.pro index f391d3a1b..28a781bd0 100644 --- a/examples/wayland/server-buffer/compositor/compositor.pro +++ b/examples/wayland/server-buffer/compositor/compositor.pro @@ -12,7 +12,8 @@ SOURCES += \ serverbufferitem.cpp HEADERS += \ - serverbufferitem.h + serverbufferitem.h \ + serverbuffertextureprovider.h OTHER_FILES = \ images/background.jpg @@ -21,3 +22,6 @@ RESOURCES += compositor.qrc CONFIG += wayland-scanner WAYLANDSERVERSOURCES += ../share-buffer.xml + +target.path = $$[QT_INSTALL_EXAMPLES]/wayland/server-buffer/compositor +INSTALLS += target diff --git a/examples/wayland/server-buffer/server-buffer.pro b/examples/wayland/server-buffer/server-buffer.pro index 16c556251..2f5f32b6d 100644 --- a/examples/wayland/server-buffer/server-buffer.pro +++ b/examples/wayland/server-buffer/server-buffer.pro @@ -1,3 +1,6 @@ TEMPLATE=subdirs SUBDIRS += client compositor + +EXAMPLE_FILES += \ + share-buffer.xml |