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

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

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