Merge remote-tracking branch 'origin/2.6'

Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/android/androidrunner.cpp
	src/plugins/projectexplorer/kitmanager.cpp

Change-Id: I653ddaef6e341818fc74aacfe30e89c07f40a8c6

src/plugins/debugger/gdb/classicgdbengine.cpp

@@ -1276,6 +1276,9 @@ static void showQtDumperLibraryWarning(const QString &details)
         "expand the Details section and click Build All."));
     if (!details.isEmpty())
         dialog.setDetailedText(details);
+#if defined(Q_OS_MAC) && QT_VERSION >= 0x050000
+    dialog.setWindowModality(Qt::WindowModal);
+#endif
     dialog.exec();
     if (dialog.clickedButton() == qtPref) {
         Core::ICore::showOptionsDialog(