Merge remote-tracking branch 'origin/4.1' into 4.2

Conflicts: src/plugins/ios/iostoolhandler.cpp Change-Id: Iff2a56e8d74ffdb4342ef75020099cced297a0bc
2016-10-18 08:02:35 +02:00
parent 993c18197b bc7b8bf20c
commit c4f92146be
3 changed files with 2192 additions and 1138 deletions
--- a/share/qtcreator/translations/qtcreator_ru.ts
+++ b/share/qtcreator/translations/qtcreator_ru.ts
--- a/src/plugins/ios/simulatorcontrol.h
+++ b/src/plugins/ios/simulatorcontrol.h
@@ -28,7 +28,9 @@
 #include <QHash>
 #include "utils/fileutils.h"

+QT_BEGIN_NAMESPACE
 class QProcess;
+QT_END_NAMESPACE

 namespace Ios {
 namespace Internal {
--- a/src/tools/tools.qbs
+++ b/src/tools/tools.qbs
@@ -12,7 +12,6 @@ Project {
        "qtpromaker/qtpromaker.qbs",
        "sdktool/sdktool.qbs",
        "valgrindfake/valgrindfake.qbs",
-        "3rdparty/iossim/iossim.qbs",
        "iostool/iostool.qbs",
        "winrtdebughelper/winrtdebughelper.qbs"
    ].concat(project.additionalTools)