Merge remote-tracking branch 'origin/3.0'

Conflicts:
	src/plugins/qmldesigner/components/formeditor/anchorindicatorgraphicsitem.cpp
	src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp
	src/plugins/qmlprofiler/qmlprofilertraceview.cpp

Change-Id: I778a0c2d0f1b4f799caaa2c2cc5daf94ec7ca352

src/plugins/ios/iosdebugsupport.cpp

@@ -31,6 +31,7 @@
 
 #include "iosrunner.h"
 #include "iosmanager.h"
+#include "iosdevice.h"
 
 #include <debugger/debuggerengine.h>
 #include <debugger/debuggerplugin.h>
@@ -40,10 +41,12 @@
 #include <debugger/debuggerrunconfigurationaspect.h>
 #include <projectexplorer/toolchain.h>
 #include <projectexplorer/target.h>
+#include <projectexplorer/taskhub.h>
 #include <qmakeprojectmanager/qmakebuildconfiguration.h>
 #include <qmakeprojectmanager/qmakenodes.h>
 #include <qmakeprojectmanager/qmakeproject.h>
 #include <qtsupport/qtkitinformation.h>
+#include <utils/fileutils.h>
 
 #include <QDir>
 #include <QTcpServer>
@@ -73,11 +76,38 @@ RunControl *IosDebugSupport::createDebugRunControl(IosRunConfiguration *runConfi
     if (device.isNull())
         return 0;
     QmakeProject *project = static_cast<QmakeProject *>(target->project());
+    Kit *kit = target->kit();
 
     DebuggerStartParameters params;
     if (device->type() == Core::Id(Ios::Constants::IOS_DEVICE_TYPE)) {
         params.startMode = AttachToRemoteProcess;
         params.platform = QLatin1String("remote-ios");
+        IosDevice::ConstPtr iosDevice = device.dynamicCast<const IosDevice>();
+        if (iosDevice.isNull())
+                return 0;
+        QString osVersion = iosDevice->osVersion();
+        Utils::FileName deviceSdk1 = Utils::FileName::fromString(QDir::homePath()
+                                             + QLatin1String("/Library/Developer/Xcode/iOS DeviceSupport/")
+                                             + osVersion + QLatin1String("/Symbols"));
+        QString deviceSdk;
+        if (deviceSdk1.toFileInfo().isDir()) {
+            deviceSdk = deviceSdk1.toString();
+        } else {
+            Utils::FileName deviceSdk2 = IosConfigurations::developerPath()
+                    .appendPath(QLatin1String("Platforms/iPhoneOS.platform/DeviceSupport/"))
+                    .appendPath(osVersion).appendPath(QLatin1String("Symbols"));
+            if (deviceSdk2.toFileInfo().isDir()) {
+                deviceSdk = deviceSdk2.toString();
+            } else {
+                TaskHub::addTask(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()),
+                                 ProjectExplorer::Constants::TASK_CATEGORY_DEPLOYMENT);
+            }
+        }
+        params.deviceSymbolsRoot = deviceSdk;
     } else {
         params.startMode = AttachExternal;
         params.platform = QLatin1String("ios-simulator");
@@ -91,7 +121,6 @@ RunControl *IosDebugSupport::createDebugRunControl(IosRunConfiguration *runConfi
             = runConfig->extraAspect<Debugger::DebuggerRunConfigurationAspect>();
     if (aspect->useCppDebugger()) {
         params.languages |= CppLanguage;
-        Kit *kit = target->kit();
         params.sysRoot = SysRootKitInformation::sysRoot(kit).toString();
         params.debuggerCommand = DebuggerKitInformation::debuggerCommand(kit).toString();
         if (ToolChain *tc = ToolChainKitInformation::toolChain(kit))

src/plugins/ios/iosdevice.cpp

@@ -190,21 +190,11 @@ QString IosDevice::name()
     return QCoreApplication::translate("Ios::Internal::IosDevice", "iOS Device");
 }
 
-/*
-// add back?
-
-QString IosDevice::cpuArchitecure() const
+QString IosDevice::osVersion() const
 {
-    return m_extraInfo.value(QLatin1String("deviceInfo")).toMap()
-            .value(QLatin1String("CPUArchitecture")).toString();
+    return m_extraInfo.value(QLatin1String("osVersion"));
 }
 
-QString IosDevice::productType() const
-{
-    return m_extraInfo.value(QLatin1String("deviceInfo")).toMap()
-            .value(QLatin1String("ProductType")).toString();
-}*/
-
 
 // IosDeviceManager
 
@@ -222,6 +212,7 @@ IosDeviceManager::TranslationMap IosDeviceManager::translationMap()
     tMap[QLatin1String("NO")]              = tr("no");
     tMap[QLatin1String("YES")]             = tr("yes");
     tMap[QLatin1String("*unknown*")]       = tr("unknown");
+    tMap[QLatin1String("osVersion")]       = tr("OS version");
     translationMap = &tMap;
     return tMap;
 }

src/plugins/ios/iosdevice.h

@@ -65,9 +65,7 @@ public:
     QVariantMap toMap() const;
     QString uniqueDeviceID() const;
     IosDevice(const QString &uid);
-    // add back? currently unused...
-    //QString cpuArchitecure() const;
-    //QString productType() const;
+    QString osVersion() const;
 
     static QString name();