Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1

Conflicts:
	.qmake.conf

Change-Id: I06247d29c4b05020e91bb377a7f93e5374184f47

2 files changed, 21 insertions, 1 deletions

diff --git a/tools/testcon/invokemethod.cpp b/tools/testcon/invokemethod.cpp
index d8cafb3..92c7a91 100644
--- a/tools/testcon/invokemethod.cpp
+++ b/tools/testcon/invokemethod.cpp
@@ -109,7 +109,7 @@ void InvokeMethod::on_comboMethods_activated(const QString &method)
     const QMetaObject *mo = activex->metaObject();
     const QMetaMethod slot = mo->method(mo->indexOfSlot(method.toLatin1()));
     QString signature = QString::fromLatin1(slot.methodSignature());
-    signature = signature.mid(signature.indexOf(QLatin1Char('(')) + 1);
+    signature.remove(0, signature.indexOf(QLatin1Char('(')) + 1);
     signature.truncate(signature.length()-1);
 
     QList<QByteArray> pnames = slot.parameterNames();
diff --git a/tools/testcon/main.cpp b/tools/testcon/main.cpp
index 7891452..cce315c 100644
--- a/tools/testcon/main.cpp
+++ b/tools/testcon/main.cpp
@@ -44,6 +44,15 @@ QAXFACTORY_DEFAULT(MainWindow,
 
 QT_USE_NAMESPACE
 
+static bool isOptionSet(int argc, char *argv[], const char *option)
+{
+    for (int i = 1; i < argc; ++i) {
+        if (!qstrcmp(argv[i], option))
+            return true;
+    }
+    return false;
+}
+
 static void redirectDebugOutput(QtMsgType, const QMessageLogContext &, const QString &msg)
 {
     if (MainWindow *mainWindow = MainWindow::instance())
@@ -52,6 +61,11 @@ static void redirectDebugOutput(QtMsgType, const QMessageLogContext &, const QSt
 
 int main( int argc, char **argv )
 {
+    if (isOptionSet(argc, argv, "--no-scaling"))
+        QCoreApplication::setAttribute(Qt::AA_DisableHighDpiScaling);
+    if (isOptionSet(argc, argv, "--no-native-siblings"))
+        QCoreApplication::setAttribute(Qt::AA_DontCreateNativeWidgetSiblings);
+
     QApplication app( argc, argv );
     QCoreApplication::setApplicationName(QLatin1String("TestCon"));
     QCoreApplication::setOrganizationName(QLatin1String("QtProject"));
@@ -67,6 +81,12 @@ int main( int argc, char **argv )
     QCommandLineOption noMessageHandlerOption(QLatin1String("no-messagehandler"),
                                               QLatin1String("Suppress installation of the message handler."));
     parser.addOption(noMessageHandlerOption);
+    QCommandLineOption noScalingDummy(QLatin1String("no-scaling"),
+                                      QLatin1String("Set Qt::AA_DisableHighDpiScaling."));
+    parser.addOption(noScalingDummy);
+    QCommandLineOption noNativeSiblingsDummy(QLatin1String("no-native-siblings"),
+                                             QLatin1String("Set Qt::AA_DontCreateNativeWidgetSiblings."));
+    parser.addOption(noNativeSiblingsDummy);
     parser.addPositionalArgument(QLatin1String("clsid/file"),
                                  QLatin1String("The clsid/file to show."));
     parser.process(app);