feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

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

Browse Source 
Conflicts:
	src/plugins/ios/iostoolhandler.cpp

Change-Id: Iff2a56e8d74ffdb4342ef75020099cced297a0bc
This commit is contained in:
Eike Ziller
2016-10-18 08:02:35 +02:00
parent 993c18197b bc7b8bf20c
commit c4f92146be
3 changed files with 2192 additions and 1138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3327
share/qtcreator/translations/qtcreator_ru.ts
View File

File diff suppressed because it is too large Load Diff

2
src/plugins/ios/simulatorcontrol.h
View File

@@ -28,7 +28,9 @@
#include <QHash> #include <QHash>
#include "utils/fileutils.h" #include "utils/fileutils.h"
QT_BEGIN_NAMESPACE
class QProcess; class QProcess;
QT_END_NAMESPACE
namespace Ios { namespace Ios {
namespace Internal { namespace Internal {

1
src/tools/tools.qbs
View File

@@ -12,7 +12,6 @@ Project {
"qtpromaker/qtpromaker.qbs", "qtpromaker/qtpromaker.qbs",
"sdktool/sdktool.qbs", "sdktool/sdktool.qbs",
"valgrindfake/valgrindfake.qbs", "valgrindfake/valgrindfake.qbs",
"3rdparty/iossim/iossim.qbs",
"iostool/iostool.qbs", "iostool/iostool.qbs",
"winrtdebughelper/winrtdebughelper.qbs" "winrtdebughelper/winrtdebughelper.qbs"
].concat(project.additionalTools) ].concat(project.additionalTools)