Make it possible to run qwindow-compositor in non-fullscreen.

Also remove some leftovers from the pro file.

Change-Id: Ic4f461054855d7e5b9ea907818f2c58565f6ea3b
Reviewed-by: Andy Nichols <andy.nichols@nokia.com>

diff --git a/examples/qwindow-compositor/main.cpp b/examples/qwindow-compositor/main.cpp
index 656bc9d..7825004 100644 (file)
--- a/examples/qwindow-compositor/main.cpp
+++ b/examples/qwindow-compositor/main.cpp
@@ -53,7 +53,12 @@ int main(int argc, char *argv[])
     QSurfaceFormat format;
     format.setDepthBufferSize(16);
 
-    QOpenGLWindow *window = new QOpenGLWindow(format, screenGeometry);
+    QRect geom = screenGeometry;
+    if (QCoreApplication::arguments().contains(QLatin1String("-nofullscreen")))
+        geom = QRect(screenGeometry.width() / 4, screenGeometry.height() / 4,
+                     screenGeometry.width() / 2, screenGeometry.height() / 2);
+
+    QOpenGLWindow *window = new QOpenGLWindow(format, geom);
     window->show();
 
     QWindowCompositor compositor(window);

diff --git a/examples/qwindow-compositor/qwindow-compositor.pro b/examples/qwindow-compositor/qwindow-compositor.pro
index 139f46a..79f318a 100644 (file)
--- a/examples/qwindow-compositor/qwindow-compositor.pro
+++ b/examples/qwindow-compositor/qwindow-compositor.pro
@@ -21,17 +21,6 @@ CONFIG += qt warn_on debug  create_prl link_prl
 OBJECTS_DIR = .obj/release-shared
 MOC_DIR = .moc/release-shared
 
-# Touch support
-isEmpty(QT_SOURCE_TREE) {
-    QTBASE = $$[QT_INSTALL_DATA]
-} 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 opengl
 
 target.path += $$[QT_INSTALL_BINS]