From 4c89518228012ddc3602eab405e4b5fb8108fcdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Lind?= <jorgen.lind@nokia.com>
Date: Mon, 5 Dec 2011 17:09:02 +0100
Subject: 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>
---
 examples/qml-compositor/main.cpp           |  4 ++--
 examples/qml-compositor/qml-compositor.pro | 25 ++++++++++---------------
 2 files changed, 12 insertions(+), 17 deletions(-)

(limited to 'examples/qml-compositor')

diff --git a/examples/qml-compositor/main.cpp b/examples/qml-compositor/main.cpp
index 7f2d47bed..0bd09434c 100644
--- a/examples/qml-compositor/main.cpp
+++ b/examples/qml-compositor/main.cpp
@@ -42,7 +42,7 @@
 #include "waylandsurface.h"
 #include "waylandsurfaceitem.h"
 
-#include <QApplication>
+#include <QGuiApplication>
 #include <QTimer>
 #include <QPainter>
 #include <QMouseEvent>
@@ -117,7 +117,7 @@ private:
 
 int main(int argc, char *argv[])
 {
-    QApplication app(argc, argv);
+    QGuiApplication app(argc, argv);
 
     QmlCompositor compositor;
     compositor.setWindowTitle(QLatin1String("QML Compositor"));
diff --git a/examples/qml-compositor/qml-compositor.pro b/examples/qml-compositor/qml-compositor.pro
index aea2fdce2..0295dedcb 100644
--- a/examples/qml-compositor/qml-compositor.pro
+++ b/examples/qml-compositor/qml-compositor.pro
@@ -6,24 +6,13 @@ INCLUDEPATH += .
 # comment out the following to not use pkg-config in the pri files
 CONFIG += use_pkgconfig
 
-DESTDIR=$$PWD/../../bin/
-
 LIBS += -L ../../lib
 
-QT += declarative v8
-QT += opengl
-
-# to be removed once scenegraph gets rid of its widget dependencies
-#QT += widgets widgets-private
-
-!isEmpty(QT.core.MAJOR_VERSION):greaterThan(QT.core.MAJOR_VERSION, 4) {
-    QT += core-private gui-private declarative-private opengl-private
-}
+QT += quick v8
+QT += quick-private
 
-include (../../src/qt-compositor/qt-compositor.pri)
-
-target.path += $$[QT_INSTALL_BINS]
-INSTALLS += target
+QT += compositor
+#include (../../src/compositor/compositor.pri)
 
 # Input
 SOURCES += main.cpp
@@ -32,3 +21,9 @@ RESOURCES = qml-compositor.qrc
 CONFIG += qt warn_on debug  create_prl link_prl
 OBJECTS_DIR = .obj/release-shared
 MOC_DIR = .moc/release-shared
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/qtwayland/qml-compositor
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qml-compositor.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtwayland/qml-compositor
+INSTALLS += target sources
-- 
cgit v1.2.3