clean up the QT+= stuff in the project files

so that we don't have to inject privates from the outside.
after recent cleanups, only qtcore and qtopengl privates are necessary,
and that only in the compositor api.

diff --git a/examples/qml-compositor/qml-compositor.pro b/examples/qml-compositor/qml-compositor.pro
index 05dff71..7aed420 100644 (file)
--- a/examples/qml-compositor/qml-compositor.pro
+++ b/examples/qml-compositor/qml-compositor.pro
@@ -17,10 +17,6 @@ LIBS += -L ../../lib
 QT += declarative
 QT += opengl
 
-!isEmpty(QT.core.MAJOR_VERSION):greaterThan(QT.core.MAJOR_VERSION, 4) {
-    QT += core-private gui-private declarative-private opengl-private
-}
-
 include (../../src/qt-compositor/qt-compositor.pri)
 
 # Input

diff --git a/examples/qwidget-compositor-mdi/qt-compositor.pro b/examples/qwidget-compositor-mdi/qt-compositor.pro
index 48ff532..59db258 100644 (file)
--- a/examples/qwidget-compositor-mdi/qt-compositor.pro
+++ b/examples/qwidget-compositor-mdi/qt-compositor.pro
@@ -6,10 +6,6 @@ INCLUDEPATH += .
 # comment out the following to not use pkg-config in the pri files
 CONFIG += use_pkgconfig
 
-!isEmpty(QT.core.MAJOR_VERSION):greaterThan(QT.core.MAJOR_VERSION, 4) {
-QT += core-private gui-private
-}
-
 DESTDIR=$$PWD/../../bin/
 
 include (../../src/qt-compositor/qt-compositor.pri)

diff --git a/examples/qwidget-compositor/qt-compositor.pro b/examples/qwidget-compositor/qt-compositor.pro
index 69c3c42..bb9fb82 100644 (file)
--- a/examples/qwidget-compositor/qt-compositor.pro
+++ b/examples/qwidget-compositor/qt-compositor.pro
@@ -6,10 +6,6 @@ INCLUDEPATH += .
 # comment out the following to not use pkg-config in the pri files
 CONFIG += use_pkgconfig
 
-!isEmpty(QT.core.MAJOR_VERSION):greaterThan(QT.core.MAJOR_VERSION, 4) {
-QT += core-private gui-private
-}
-
 DESTDIR=$$PWD/../../bin/
 
 include (../../src/qt-compositor/qt-compositor.pri)

diff --git a/src/qt-compositor/compositor_api/compositor_api.pri b/src/qt-compositor/compositor_api/compositor_api.pri
index e605c8c..b04f79f 100644 (file)
--- a/src/qt-compositor/compositor_api/compositor_api.pri
+++ b/src/qt-compositor/compositor_api/compositor_api.pri
@@ -14,3 +14,8 @@ contains(QT, declarative) {
 
    DEFINES += QT_COMPOSITOR_DECLARATIVE
 }
+
+!isEmpty(QT.core.MAJOR_VERSION):greaterThan(QT.core.MAJOR_VERSION, 4) {
+    QT += core-private
+    contains(QT, opengl):QT += opengl-private gui-private
+}

diff --git a/src/qt-compositor/compositor_api/waylandsurfaceitem.cpp b/src/qt-compositor/compositor_api/waylandsurfaceitem.cpp
index f2fc5cd..af1b19b 100644 (file)
--- a/src/qt-compositor/compositor_api/waylandsurfaceitem.cpp
+++ b/src/qt-compositor/compositor_api/waylandsurfaceitem.cpp
@@ -42,7 +42,6 @@
 #include "waylandsurface.h"
 
 #include <QtDeclarative/QSGEngine>
-//#include <private/qsgitem_p.h>
 
 #include <QtGui/QKeyEvent>