Merge remote-tracking branch 'origin/3.3'

src/plugins/ios/iosdebugsupport.cpp

@@ -136,7 +136,7 @@ RunControl *IosDebugSupport::createDebugRunControl(IosRunConfiguration *runConfi
         Utils::FileName xcodeInfo = IosConfigurations::developerPath().parentDir()
                 .appendPath(QLatin1String("Info.plist"));
         bool buggyLldb = false;
-        if (xcodeInfo.toFileInfo().exists()) {
+        if (xcodeInfo.exists()) {
             QSettings settings(xcodeInfo.toString(), QSettings::NativeFormat);
             QStringList version = settings.value(QLatin1String("CFBundleShortVersionString")).toString()
                     .split(QLatin1Char('.'));
@@ -147,7 +147,7 @@ RunControl *IosDebugSupport::createDebugRunControl(IosRunConfiguration *runConfi
         bundlePath.chop(4);
         Utils::FileName dsymPath = Utils::FileName::fromString(
                     bundlePath.append(QLatin1String(".dSYM")));
-        if (!dsymPath.toFileInfo().exists()) {
+        if (!dsymPath.exists()) {
             if (buggyLldb)
                 TaskHub::addTask(Task::Warning,
                                  tr("Debugging with Xcode 5.0.x can be unreliable without a dSYM. "

src/plugins/ios/iosdeploystep.cpp

@@ -272,7 +272,7 @@ void IosDeployStep::checkProvisioningProfile()
 
     // the file is a signed plist stored in DER format
     // we simply search for start and end of the plist instead of decoding the DER payload
-    if (!provisioningFilePath.toFileInfo().exists())
+    if (!provisioningFilePath.exists())
         return;
     QFile provisionFile(provisioningFilePath.toString());
     if (!provisionFile.open(QIODevice::ReadOnly))

src/plugins/ios/iosdsymbuildstep.cpp

@@ -450,7 +450,7 @@ QStringList IosDsymBuildStep::defaultCmdList() const
     QString dsymutilCmd = QLatin1String("dsymutil");
     Utils::FileName dsymUtilPath = IosConfigurations::developerPath()
             .appendPath(QLatin1String("Toolchains/XcodeDefault.xctoolchain/usr/bin/dsymutil"));
-    if (dsymUtilPath.toFileInfo().exists())
+    if (dsymUtilPath.exists())
         dsymutilCmd = dsymUtilPath.toUserOutput();
     IosRunConfiguration *runConf =
             qobject_cast<IosRunConfiguration *>(target()->activeRunConfiguration());

src/plugins/ios/iosrunner.cpp

@@ -117,7 +117,7 @@ void IosRunner::start()
     }
     m_cleanExit = false;
     m_qmlPort = 0;
-    if (!QFileInfo(m_bundleDir).exists()) {
+    if (!QFileInfo::exists(m_bundleDir)) {
         TaskHub::addTask(Task::Warning,
                          tr("Could not find %1.").arg(m_bundleDir),
                          ProjectExplorer::Constants::TASK_CATEGORY_DEPLOYMENT);

src/plugins/ios/iostoolhandler.cpp

@@ -738,7 +738,7 @@ QString IosToolHandler::iosSimulatorToolPath()
     Utils::FileName devPath = Internal::IosConfigurations::developerPath();
     bool version182 = devPath.appendPath(QLatin1String(
         "Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks/iPhoneSimulatorRemoteClient.framework"))
-            .toFileInfo().exists();
+            .exists();
     QString res = Core::ICore::libexecPath() + QLatin1String("/ios/iossim");
     if (version182)
         res = res.append(QLatin1String("_1_8_2"));