Merge remote-tracking branch 'origin/stable' into dev

For the conflicts in msvc_nmake.cpp the ifdefs are extended since we
need to support windows phone in the target branch while it is not there
in the current stable branch (as of Qt 5.2).

Conflicts:
	configure
	qmake/generators/win32/msvc_nmake.cpp
	src/3rdparty/angle/src/libEGL/Surface.cpp
	src/angle/src/common/common.pri
	src/corelib/global/qglobal.h
	src/corelib/io/qstandardpaths.cpp
	src/plugins/platforms/qnx/qqnxintegration.cpp
	src/plugins/platforms/qnx/qqnxscreeneventhandler.h
	src/plugins/platforms/xcb/qglxintegration.h
	src/widgets/kernel/win.pri
	tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp
	tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
	tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
	tools/configure/configureapp.cpp

Change-Id: I00b579eefebaf61d26ab9b00046d2b5bd5958812

1 files changed, 13 insertions, 0 deletions

diff --git a/src/plugins/platforms/qnx/qqnxscreeneventthread.h b/src/plugins/platforms/qnx/qqnxscreeneventthread.h
index 5e931819be..cbdb505b3b 100644
--- a/src/plugins/platforms/qnx/qqnxscreeneventthread.h
+++ b/src/plugins/platforms/qnx/qqnxscreeneventthread.h
@@ -43,6 +43,7 @@
 #define QQNXSCREENEVENTTHREAD_H
 
 #include <QtCore/QThread>
+#include <QtCore/QMutex>
 
 #include <screen/screen.h>
 
@@ -50,21 +51,33 @@ QT_BEGIN_NAMESPACE
 
 class QQnxScreenEventHandler;
 
+typedef QVarLengthArray<screen_event_t, 64> QQnxScreenEventArray;
+
 class QQnxScreenEventThread : public QThread
 {
+    Q_OBJECT
+
 public:
     QQnxScreenEventThread(screen_context_t context, QQnxScreenEventHandler *screenEventHandler);
     ~QQnxScreenEventThread();
 
     static void injectKeyboardEvent(int flags, int sym, int mod, int scan, int cap);
 
+    QQnxScreenEventArray *lock();
+    void unlock();
+
 protected:
     void run();
 
+Q_SIGNALS:
+    void eventPending();
+
 private:
     void shutdown();
 
     screen_context_t m_screenContext;
+    QMutex m_mutex;
+    QQnxScreenEventArray m_events;
     QQnxScreenEventHandler *m_screenEventHandler;
     bool m_quit;
 };