Merge lp:~aacid/qtmir/build_qt57 into lp:qtmir

[Albert Astals Cid]

Build with Qt 5.7

Build with Qt 5.7

[Gerry Boland (gerboland)]

LGTM

review: Approve

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:570
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/409/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3315
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3343
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3195
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3195/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3195
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3195/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3195
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3195/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3195
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3195/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3195
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3195/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3195
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3195/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3195
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3195/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3195
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3195/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3195
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3195/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/409/rebuild

review: Approve (continuous-integration)

[lp:~aacid/qtmir/build_qt57]

571. By Albert Astals Cid on 2016-11-18

Use the generic orientation sensor for the test

[Gerry Boland (gerboland)]

review: Approve

[lp:~aacid/qtmir/build_qt57]

572. By Albert Astals Cid on 2016-11-18

sp

=== modified file 'src/platforms/mirserver/miropenglcontext.cpp'
--- src/platforms/mirserver/miropenglcontext.cpp	2016-06-07 19:30:06 +0000
+++ src/platforms/mirserver/miropenglcontext.cpp	2016-11-18 15:00:52 +0000
@@ -179,7 +179,14 @@
     }
 }
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
 QFunctionPointer MirOpenGLContext::getProcAddress(const QByteArray &procName)
 {
     return eglGetProcAddress(procName.constData());
 }
+#else
+QFunctionPointer MirOpenGLContext::getProcAddress(const char *procName)
+{
+    return eglGetProcAddress(procName);
+}
+#endif

=== modified file 'src/platforms/mirserver/miropenglcontext.h'
--- src/platforms/mirserver/miropenglcontext.h	2016-05-06 08:31:13 +0000
+++ src/platforms/mirserver/miropenglcontext.h	2016-11-18 15:00:52 +0000
@@ -44,7 +44,11 @@
 
     bool isSharing() const override { return false; }
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
     QFunctionPointer getProcAddress(const QByteArray &procName) override;
+#else
+    QFunctionPointer getProcAddress(const char *procName) override;
+#endif
 
 #ifdef QGL_DEBUG
     Q_SLOT void onGlDebugMessageLogged(QOpenGLDebugMessage m) { qDebug() << m; }

=== modified file 'tests/mirserver/Screen/screen_test.cpp'
--- tests/mirserver/Screen/screen_test.cpp	2016-02-15 16:02:18 +0000
+++ tests/mirserver/Screen/screen_test.cpp	2016-11-18 15:00:52 +0000
@@ -22,6 +22,8 @@
 
 #include <screen.h>
 
+#include <QSensorManager>
+
 using namespace ::testing;
 
 namespace mg = mir::graphics;
@@ -37,6 +39,12 @@
     if (!qEnvironmentVariableIsSet("QT_ACCEL_FILEPATH")) {
         // Trick Qt >= 5.4.1 to load the generic sensors
         qputenv("QT_ACCEL_FILEPATH", "dummy");
+        // Tell Qt >= 5.7 to use the generic orientation sensor
+        // since the proper linux one is not always running
+        // in test environments making the test fail
+        if (QSensorManager::isBackendRegistered("QOrientationSensor", "iio-sensor-proxy.orientationsensor")) {
+            QSensorManager::unregisterBackend("QOrientationSensor", "iio-sensor-proxy.orientationsensor");
+        }
     }
 
     Screen::skipDBusRegistration = true;

=== modified file 'tests/mirserver/ScreensModel/CMakeLists.txt'
--- tests/mirserver/ScreensModel/CMakeLists.txt	2016-09-07 09:23:54 +0000
+++ tests/mirserver/ScreensModel/CMakeLists.txt	2016-11-18 15:00:52 +0000
@@ -23,6 +23,8 @@
 
 add_executable(ScreensModelTest ${SCREENCONTROLLER_TEST_SOURCES})
 
+set_property(TARGET ScreensModelTest PROPERTY CXX_STANDARD 14)
+
 target_link_libraries(
   ScreensModelTest
   qpa-mirserver-nolttng