Merge lp:~aacid/qtubuntu/match_function_signature into lp:qtubuntu

[Albert Astals Cid]

Match the function signature of qplatformopenglcontext.h

Makes coverity understand the code

[Gerry Boland (gerboland)]

Okies!

[Gerry Boland (gerboland)]

review: Approve

[Gerry Boland (gerboland)]

My eglconvenience branch completely removes these lines from qtubuntu. This won't be needed shortly. Thanks though

review: Disapprove

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

PASSED: Continuous integration, rev:
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/68/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/1819
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1840
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1780
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1780
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1780
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1771
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1771/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1771
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1771/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1771
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1771/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1771
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1771/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1771
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1771/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1771
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1771/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1771
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1771/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1771
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1771/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1771
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1771/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

Unmerged revisions

317. By Albert Astals Cid on 2016-05-27

Match the function signature of qplatformopenglcontext.h

Also makes coverity understand the code

=== modified file 'src/ubuntumirclient/glcontext.cpp'
--- src/ubuntumirclient/glcontext.cpp	2016-04-28 14:09:54 +0000
+++ src/ubuntumirclient/glcontext.cpp	2016-05-27 13:19:15 +0000
@@ -219,7 +219,7 @@
     ubuntuWindow->onSwapBuffersDone();
 }
 
-void (*UbuntuOpenGLContext::getProcAddress(const QByteArray& procName)) ()
+QFunctionPointer UbuntuOpenGLContext::getProcAddress(const QByteArray &procName)
 {
     ASSERT(eglBindAPI(api_in_use()) == EGL_TRUE);
     return eglGetProcAddress(procName.constData());

=== modified file 'src/ubuntumirclient/glcontext.h'
--- src/ubuntumirclient/glcontext.h	2016-04-28 14:09:54 +0000
+++ src/ubuntumirclient/glcontext.h	2016-05-27 13:19:15 +0000
@@ -34,7 +34,7 @@
     bool makeCurrent(QPlatformSurface *surface) override;
     void doneCurrent() override;
     bool isValid() const override { return mEglContext != EGL_NO_CONTEXT; }
-    void (*getProcAddress(const QByteArray& procName)) () override;
+    QFunctionPointer getProcAddress(const QByteArray &procName) override;
 
     EGLContext eglContext() const { return mEglContext; }