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

Change-Id: I2a044d44ca991ba20ddd710053b85afb51e362d3

1 files changed, 23 insertions, 0 deletions

diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index f429ad2229..aeb6107f2f 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -96,6 +96,10 @@
 #include <QtGui/QClipboard>
 #endif
 
+#ifndef QT_NO_LIBRARY
+#include <QtCore/QLibrary>
+#endif
+
 #if defined(Q_OS_MAC)
 #  include "private/qcore_mac_p.h"
 #elif defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
@@ -1187,6 +1191,7 @@ void QGuiApplicationPrivate::init()
     QCoreApplicationPrivate::is_app_running = false; // Starting up.
 
     bool doGrabUnderDebugger = false;
+    bool loadTestability = false;
     QList<QByteArray> pluginList;
     // Get command line params
 #ifndef QT_NO_SESSIONMANAGER
@@ -1237,6 +1242,8 @@ void QGuiApplicationPrivate::init()
                 is_session_restored = true;
             }
 #endif
+        } else if (arg == "-testability") {
+            loadTestability = true;
         } else {
             argv[j++] = argv[i];
         }
@@ -1297,6 +1304,22 @@ void QGuiApplicationPrivate::init()
     session_manager = new QSessionManager(q, session_id, session_key);
 #endif
 
+#ifndef QT_NO_LIBRARY
+    if (loadTestability) {
+        QLibrary testLib(QStringLiteral("qttestability"));
+        if (testLib.load()) {
+            typedef void (*TasInitialize)(void);
+            TasInitialize initFunction = (TasInitialize)testLib.resolve("qt_testability_init");
+            if (initFunction) {
+                initFunction();
+            } else {
+                qCritical() << "Library qttestability resolve failed!";
+            }
+        } else {
+            qCritical() << "Library qttestability load failed:" << testLib.errorString();
+        }
+    }
+#endif // QT_NO_LIBRARY
 }
 
 extern void qt_cleanupFontDatabase();