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/qwindow-compositor/qwindow-compositor.pro | |
| 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/qwindow-compositor/qwindow-compositor.pro')
| -rw-r--r-- | examples/qwindow-compositor/qwindow-compositor.pro | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/examples/qwindow-compositor/qwindow-compositor.pro b/examples/qwindow-compositor/qwindow-compositor.pro index 79f318a46..e154ad96e 100644 --- a/examples/qwindow-compositor/qwindow-compositor.pro +++ b/examples/qwindow-compositor/qwindow-compositor.pro @@ -6,10 +6,8 @@ INCLUDEPATH += . # comment out the following to not use pkg-config in the pri files CONFIG += use_pkgconfig -DESTDIR=$$PWD/../../bin/ - LIBS += -L ../../lib -include (../../src/qt-compositor/qt-compositor.pri) +#include (../../src/qt-compositor/qt-compositor.pri) # Input SOURCES += main.cpp \ @@ -21,10 +19,10 @@ CONFIG += qt warn_on debug create_prl link_prl OBJECTS_DIR = .obj/release-shared MOC_DIR = .moc/release-shared -QT += gui opengl +QT += gui -target.path += $$[QT_INSTALL_BINS] -INSTALLS += target +QT += compositor +#include(../../src/compositor/compositor.pri) HEADERS += \ qopenglwindow.h \ @@ -32,3 +30,9 @@ HEADERS += \ qwindowcompositor.h RESOURCES += qwindow-compositor.qrc + +# install +target.path = $$[QT_INSTALL_EXAMPLES]/qtwayland/qwindow-compositor +sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qwindow-compositor.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/qtwayland/qwindow-compositor +INSTALLS += target sources |