Merge lp:~abreu-alexandre/ubuntu-html5-theme/remove-qt-private-deps into lp:ubuntu-html5-theme

[Alexandre Abreu]

Update debian/control to remove qt private package deps; Rely on Qt 5.4's new API

Update debian/control to remove qt private package deps; Rely on Qt 5.4's new API

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:205
http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-ci/180/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/853/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-vivid-amd64-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-vivid-armhf-ci/25
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/682/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/1021
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/1021/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-html5-theme-ci/180/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2015-04-10 13:32:31 +0000
+++ debian/control	2015-04-30 17:31:40 +0000
@@ -9,8 +9,7 @@
                python3-setuptools,
                qt5-default,
                qt5-qmake,
-               qtbase5-dev,
-               qtbase5-private-dev,
+	       qtbase5-dev (>= 5.4),
                qtdeclarative5-dev,
                qtdeclarative5-qtquick2-plugin,
                qtdeclarative5-ubuntu-ui-toolkit-plugin,

=== modified file 'src/ubuntu-html5-app-launcher/CMakeLists.txt'
--- src/ubuntu-html5-app-launcher/CMakeLists.txt	2014-12-16 21:02:55 +0000
+++ src/ubuntu-html5-app-launcher/CMakeLists.txt	2015-04-30 17:31:40 +0000
@@ -21,8 +21,6 @@
 )
 qt5_use_modules(${HTML5_LAUNCHER} Core Gui Widgets Quick)
 
-include_directories(${Qt5Quick_PRIVATE_INCLUDE_DIRS})
-
 # install qml files
 file(GLOB QML_FILES *.qml)
 install(FILES ${QML_FILES} DESTINATION ${CMAKE_INSTALL_DATADIR}/ubuntu-html5-app-launcher/qml)

=== modified file 'src/ubuntu-html5-app-launcher/main.cpp'
--- src/ubuntu-html5-app-launcher/main.cpp	2015-03-16 17:48:23 +0000
+++ src/ubuntu-html5-app-launcher/main.cpp	2015-04-30 17:31:40 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2015 Canonical Ltd.
  *
  * This file is part of ubuntu-html5-ui-toolkit.
  *
@@ -28,11 +28,6 @@
 #include <QQmlEngine>
 #include <QQmlContext>
 #include <QQmlComponent>
-#if QT_VERSION < QT_VERSION_CHECK(5, 3, 0)
-#include <QtQuick/private/qsgcontext_p.h>
-#else
-#include <QtGui/private/qopenglcontext_p.h>
-#endif
 
 
 namespace {
@@ -107,6 +102,9 @@
 
 int main(int argc, char *argv[])
 {
+    // Enable compositing in oxide
+    QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts);
+
     QGuiApplication app(argc, argv);
 
     if (!app.arguments().count())
@@ -197,17 +195,6 @@
     }
     setUpQmlImportPathIfNecessary();
 
-    // Enable compositing in oxide
-    QOpenGLContext* glcontext = new QOpenGLContext();
-    glcontext->create();
-#if QT_VERSION < QT_VERSION_CHECK(5, 3, 0)
-    QSGContext::setSharedOpenGLContext(glcontext);
-#elif QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
-    QOpenGLContextPrivate::setGlobalShareContext(glcontext);
-#else
-    qt_gl_set_global_share_context(glcontext);
-#endif
-
     QQuickView view;
     QQmlEngine* engine = view.engine();