diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2011-12-05 17:09:02 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2011-12-07 09:58:35 +0100 |
| commit | 4c89518228012ddc3602eab405e4b5fb8108fcdf (patch) | |
| tree | 615d4fdc38999e408d52998c39760064d223b652 /examples/qwidget-compositor | |
| parent | 542eca71e074b5110df2aaf822449bf7d6ec2b91 (diff) | |
Make wayland actually a module
Also fix so that QtCompositor can be built as shared object.
+ fix so that the default QT_WAYLAND_GL_CONFIG is wayland_egl
Change-Id: I02b72e99286584426bd37ab2d00bbc84af11efdc
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
Diffstat (limited to 'examples/qwidget-compositor')
| -rw-r--r-- | examples/qwidget-compositor/qwidget-compositor.pro | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/examples/qwidget-compositor/qwidget-compositor.pro b/examples/qwidget-compositor/qwidget-compositor.pro index 98bcb0c4f..409930a43 100644 --- a/examples/qwidget-compositor/qwidget-compositor.pro +++ b/examples/qwidget-compositor/qwidget-compositor.pro @@ -6,9 +6,7 @@ INCLUDEPATH += . # comment out the following to not use pkg-config in the pri files CONFIG += use_pkgconfig -DESTDIR=$$PWD/../../bin/ - -include (../../src/qt-compositor/qt-compositor.pri) +#include (../../src/qt-compositor/qt-compositor.pri) # Input SOURCES += main.cpp @@ -23,12 +21,17 @@ isEmpty(QT_SOURCE_TREE) { } else { QTBASE = $$QT_SOURCE_TREE } + #TOUCHSCREEN_BASE = $$QTBASE/src/plugins/generic/touchscreen #SOURCES += $$TOUCHSCREEN_BASE/qtouchscreen.cpp #HEADERS += $$TOUCHSCREEN_BASE/qtouchscreen.h #INCLUDEPATH += $$TOUCHSCREEN_BASE #LIBS += -ludev -lmtdev -QT += gui-private widgets widgets-private opengl opengl-private -target.path += $$[QT_INSTALL_DATA]/bin -INSTALLS += target +QT += gui-private widgets widgets-private opengl opengl-private compositor + +# install +target.path = $$[QT_INSTALL_EXAMPLES]/qtwayland/qwidget-compositor +sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qwidget-compositor.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/qtwayland/qwidget-compositor +INSTALLS += target sources |