diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2014-12-10 13:11:02 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2014-12-10 13:20:02 +0100 |
| commit | 541d00453ab134874a2a2f95079703f1f57ebd89 (patch) | |
| tree | fd2d375681c6fb266a740971442964e8a141ac3e /src/plugins/ios/iosdevice.cpp | |
| parent | 62b70fb2398ca16c471ce65be2bfb996a030302b (diff) | |
| parent | f8a68cc69a9c8cf0c0ddd15e9dae4bd84ae8b0bd (diff) | |
Merge remote-tracking branch 'origin/3.3'
Conflicts:
qtcreator.pri
qtcreator.qbs
src/plugins/projectexplorer/projectexplorer.cpp
src/shared/qbs
Change-Id: I6d91042bb48314d00be721099aed19feca74e0ce
Diffstat (limited to 'src/plugins/ios/iosdevice.cpp')
| -rw-r--r-- | src/plugins/ios/iosdevice.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/ios/iosdevice.cpp b/src/plugins/ios/iosdevice.cpp index a6d0629525..07ed5c03ce 100644 --- a/src/plugins/ios/iosdevice.cpp +++ b/src/plugins/ios/iosdevice.cpp @@ -292,7 +292,7 @@ void IosDeviceManager::deviceDisconnected(const QString &uid) void IosDeviceManager::updateInfo(const QString &devId) { - IosToolHandler *requester = new IosToolHandler(IosDeviceType(), this); + IosToolHandler *requester = new IosToolHandler(IosDeviceType(IosDeviceType::IosDevice), this); connect(requester, SIGNAL(deviceInfo(Ios::IosToolHandler*,QString,Ios::IosToolHandler::Dict)), SLOT(deviceInfo(Ios::IosToolHandler*,QString,Ios::IosToolHandler::Dict)), Qt::QueuedConnection); connect(requester, SIGNAL(finished(Ios::IosToolHandler*)), |