Merge lp:~osomon/webbrowser-app/AA_ShareOpenGLContexts into lp:webbrowser-app

[Olivier Tilloy]

Use Qt::AA_ShareOpenGLContexts when building with Qt >= 5.4.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:907
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1476/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1422
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/234
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/234
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/234/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/234
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1259
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1420
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1420/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18165

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1476/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'src/app/CMakeLists.txt'
--- src/app/CMakeLists.txt	2014-11-26 10:38:23 +0000
+++ src/app/CMakeLists.txt	2015-02-18 15:49:13 +0000
@@ -18,7 +18,11 @@
 
 qt5_use_modules(${COMMONLIB} Core Gui Network Qml Quick Widgets)
 
-include_directories(${Qt5Quick_PRIVATE_INCLUDE_DIRS})
+if(${Qt5Core_VERSION_STRING} VERSION_LESS "5.3.0")
+    include_directories(${Qt5Quick_PRIVATE_INCLUDE_DIRS})
+elseif(${Qt5Core_VERSION_STRING} VERSION_LESS "5.4.0")
+    include_directories(${Qt5Gui_PRIVATE_INCLUDE_DIRS})
+endif()
 
 file(GLOB QML_FILES *.qml)
 install(FILES ${QML_FILES} DESTINATION ${CMAKE_INSTALL_DATADIR}/webbrowser-app)

=== modified file 'src/app/browserapplication.cpp'
--- src/app/browserapplication.cpp	2014-12-03 15:31:38 +0000
+++ src/app/browserapplication.cpp	2015-02-18 15:49:13 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2015 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -28,7 +28,7 @@
 #include <QtQuick/QQuickWindow>
 #if QT_VERSION < QT_VERSION_CHECK(5, 3, 0)
 #include <QtQuick/private/qsgcontext_p.h>
-#else
+#elif QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
 #include <QtGui/private/qopenglcontext_p.h>
 #endif
 
@@ -126,15 +126,17 @@
     // which is needed by Online Accounts.
     QString unversionedAppId = QStringList(appIdParts.mid(0, 2)).join('_');
 
-    // Enable compositing in oxide
+#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
+    // Enable compositing in oxide (not needed starting with Qt 5.4
+    // because the Qt::AA_ShareOpenGLContexts attribute is set before
+    // the application is instantiated).
     QOpenGLContext* glcontext = new QOpenGLContext(this);
     glcontext->create();
 #if QT_VERSION < QT_VERSION_CHECK(5, 3, 0)
     QSGContext::setSharedOpenGLContext(glcontext);
-#elif QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
+#else
     QOpenGLContextPrivate::setGlobalShareContext(glcontext);
-#else
-    qt_gl_set_global_share_context(glcontext);
+#endif
 #endif
 
     QString devtoolsPort = inspectorPort();

=== modified file 'src/app/webbrowser/webbrowser-app.cpp'
--- src/app/webbrowser/webbrowser-app.cpp	2015-02-09 10:16:16 +0000
+++ src/app/webbrowser/webbrowser-app.cpp	2015-02-18 15:49:13 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2015 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -42,6 +42,7 @@
 #include <QtCore/QFileInfo>
 #include <QtCore/QString>
 #include <QtCore/QTextStream>
+#include <QtCore/QtGlobal>
 #include <QtCore/QVariant>
 #include <QtQml/QtQml>
 #include <QtQuick/QQuickWindow>
@@ -132,6 +133,9 @@
 
 int main(int argc, char** argv)
 {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
+    QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts);
+#endif
     WebbrowserApp app(argc, argv);
     if (app.initialize()) {
         return app.run();

=== modified file 'src/app/webcontainer/webapp-container.cpp'
--- src/app/webcontainer/webapp-container.cpp	2015-01-26 14:53:18 +0000
+++ src/app/webcontainer/webapp-container.cpp	2015-02-18 15:49:13 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2015 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -439,6 +439,9 @@
 
 int main(int argc, char** argv)
 {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
+    QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts);
+#endif
     WebappContainer app(argc, argv);
     if (app.initialize()) {
         return app.run();