Merge remote-tracking branch 'origin/4.13' into master

 Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
	src/plugins/cmakeprojectmanager/cmakebuildstep.h
	tests/auto/debugger/tst_namedemangler.cpp
	tests/auto/qml/codemodel/check/tst_check.cpp

Change-Id: Iefd5f71c03c0078513b76a92af764a4fb22ee4c2

1 files changed, 19 insertions, 21 deletions

diff --git a/src/plugins/ios/iosrunner.cpp b/src/plugins/ios/iosrunner.cpp
index b422723a952..e7fcf05d0f9 100644
--- a/src/plugins/ios/iosrunner.cpp
+++ b/src/plugins/ios/iosrunner.cpp
@@ -436,28 +436,26 @@ void IosDebugSupport::start()
         IosDevice::ConstPtr dev = device().dynamicCast<const IosDevice>();
         setStartMode(AttachToRemoteProcess);
         setIosPlatform("remote-ios");
-        QString osVersion = dev->osVersion();
-        FilePath deviceSdk1 = FilePath::fromString(QDir::homePath()
-                                             + "/Library/Developer/Xcode/iOS DeviceSupport/"
-                                             + osVersion + "/Symbols");
-        QString deviceSdk;
-        if (deviceSdk1.isDir()) {
-            deviceSdk = deviceSdk1.toString();
-        } else {
-            const FilePath deviceSdk2 = IosConfigurations::developerPath()
-                    .pathAppended("Platforms/iPhoneOS.platform/DeviceSupport/"
-                                  + osVersion + "/Symbols");
-            if (deviceSdk2.isDir()) {
-                deviceSdk = deviceSdk2.toString();
-            } else {
-                TaskHub::addTask(DeploymentTask(Task::Warning, tr(
-                  "Could not find device specific debug symbols at %1. "
-                  "Debugging initialization will be slow until you open the Organizer window of "
-                  "Xcode with the device connected to have the symbols generated.")
-                                 .arg(deviceSdk1.toUserOutput())));
-            }
+        const QString osVersion = dev->osVersion();
+        const QString cpuArchitecture = dev->cpuArchitecture();
+        const FilePaths symbolsPathCandidates = {
+            FilePath::fromString(QDir::homePath() + "/Library/Developer/Xcode/iOS DeviceSupport/"
+                                 + osVersion + " " + cpuArchitecture + "/Symbols"),
+            FilePath::fromString(QDir::homePath() + "/Library/Developer/Xcode/iOS DeviceSupport/"
+                                 + osVersion + "/Symbols"),
+            IosConfigurations::developerPath().pathAppended(
+                "Platforms/iPhoneOS.platform/DeviceSupport/" + osVersion + "/Symbols")};
+        const FilePath deviceSdk = Utils::findOrDefault(symbolsPathCandidates, &FilePath::isDir);
+
+        if (deviceSdk.isEmpty()) {
+            TaskHub::addTask(DeploymentTask(
+                Task::Warning,
+                tr("Could not find device specific debug symbols at %1. "
+                   "Debugging initialization will be slow until you open the Organizer window of "
+                   "Xcode with the device connected to have the symbols generated.")
+                    .arg(symbolsPathCandidates.constFirst().toUserOutput())));
         }
-        setDeviceSymbolsRoot(deviceSdk);
+        setDeviceSymbolsRoot(deviceSdk.toString());
     } else {
         setStartMode(AttachExternal);
         setIosPlatform("ios-simulator");