Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into master-integration

* 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse: (101 commits)
  Fixes detected by the static-check
  Fixup license headers in Lighthouse plugins
  Mac: add autorelease pools to create_sys
  Don't skip remaining events on unhandled events in xcb backend.
  Lighthouse: Xcb, compile fix for the glx path
  Lighthouse: Make sure we don't use xkbcommon
  Lighthouse: Add pkg-config check for opengl es2
  Rename qnaclunimplemented -> qfunctions_nacl
  Rename qconfig-minimal-system-depenencies.h
  Add QT_NO_FILESYSTEMITERATOR.
  Add QT_NO_DYNAMIC_LIBRARY.
  Compile.
  NaCl: Dont force release builds.
  NaCl: disable libtiff.
  posix platformdefs: Add QT_NO_SOCKET_H.
  qpnghandler: Compile with QT_NO_IMAGE_TEXT.
  Lighthouse: Support Q_NO_CLIPBOARD.
  Compile.
  Fix CoreServices framework addition for qpa.
  Update NaCl mkspecs.
  ...

2 files changed, 9 insertions, 0 deletions

diff --git a/src/plugins/platforms/eglfs/qeglfsintegration.cpp b/src/plugins/platforms/eglfs/qeglfsintegration.cpp
index f4a97fc..78981f9 100644
--- a/src/plugins/platforms/eglfs/qeglfsintegration.cpp
+++ b/src/plugins/platforms/eglfs/qeglfsintegration.cpp
@@ -65,6 +65,14 @@ QEglFSIntegration::QEglFSIntegration()
 #endif
 }
 
+bool QEglFSIntegration::hasCapability(QPlatformIntegration::Capability cap) const
+{
+    switch (cap) {
+    case ThreadedPixmaps: return true;
+    default: return QPlatformIntegration::hasCapability(cap);
+    }
+}
+
 QPixmapData *QEglFSIntegration::createPixmapData(QPixmapData::PixelType type) const
 {
 #ifdef QEGL_EXTRA_DEBUG
diff --git a/src/plugins/platforms/eglfs/qeglfsintegration.h b/src/plugins/platforms/eglfs/qeglfsintegration.h
index c199653..65b834f 100644
--- a/src/plugins/platforms/eglfs/qeglfsintegration.h
+++ b/src/plugins/platforms/eglfs/qeglfsintegration.h
@@ -56,6 +56,7 @@ class QEglFSIntegration : public QPlatformIntegration
 public:
     QEglFSIntegration();
 
+    bool hasCapability(QPlatformIntegration::Capability cap) const;
     QPixmapData *createPixmapData(QPixmapData::PixelType type) const;
     QPlatformWindow *createPlatformWindow(QWidget *widget, WId winId) const;
     QWindowSurface *createWindowSurface(QWidget *widget, WId winId) const;