Merge remote-tracking branch 'origin/3.0'

dist/changes-3.0.0

@@ -91,6 +91,8 @@ Diff Viewer
 Version Control Systems
    * Fixed crash when reverting changes while commit editor is open (QTCREATORBUG-10190)
    * Added VCS topic to window title
+   * Fixed that user was asked about adding file to VCS even if it already
+     was in VCS (QTCREATORBUG-2455)
    * Git
       * Added information about files with conflict when doing "git stash pop"
       * Added action for opening "git gui"
@@ -98,6 +100,16 @@ Version Control Systems
       * Added support for setting remote tracking branch (QTCREATORBUG-8863)
       * Added disambiguation of branch names (QTCREATORBUG-9700)
       * Fixed updating of log view from branches dialog (QTCREATORBUG-9783)
+      * Added support for cherry-picking top commit from a branch
+      * Changed log to follow renames
+      * Fixed that author data was discarded when commit window lost focus
+      * Added support for "git reflog"
+      * Added list of branches to header when showing commits
+      * Fixed that cloning showed progress messages only after the
+        operation was done (QTCREATORBUG-6565)
+      * Added support for recursive clone
+      * Added support for staging and unstaging chunks in unified diff editor (QTCREATORBUG-5875)
+      * Fixed "Blame <commit>" and "Blame Parent" for renamed files
    * ClearCase
 
 FakeVim

src/plugins/coreplugin/removefiledialog.ui

@@ -2,6 +2,14 @@
 <ui version="4.0">
  <class>Core::RemoveFileDialog</class>
  <widget class="QDialog" name="Core::RemoveFileDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>514</width>
+    <height>159</height>
+   </rect>
+  </property>
   <property name="sizePolicy">
    <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
     <horstretch>0</horstretch>

src/plugins/ios/iosconfigurations.cpp

@@ -246,8 +246,7 @@ void IosConfigurations::updateAutomaticKitList()
     foreach (Kit *k, KitManager::kits()) {
         Core::Id deviceKind = DeviceTypeKitInformation::deviceTypeId(k);
         if (deviceKind != Constants::IOS_DEVICE_TYPE
-                && deviceKind != Constants::IOS_SIMULATOR_TYPE
+                && deviceKind != Constants::IOS_SIMULATOR_TYPE) {
-                && deviceKind != ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE) {
             if (debugProbe)
                 qDebug() << "skipping existing kit with deviceKind " << deviceKind.toString();
             continue;

src/plugins/qmakeprojectmanager/qmakebuildinfo.h

@@ -48,6 +48,17 @@ public:
     QString additionalArguments;
     QString makefile;
 
+    bool operator==(const QmakeBuildInfo &o) {
+        return displayName == o.displayName
+                && typeName == o.typeName
+                && buildDirectory == o.buildDirectory
+                && kitId == o.kitId
+                && typeName == o.typeName
+                && supportsShadowBuild == o.supportsShadowBuild
+                && type == o.type
+                && additionalArguments == o.additionalArguments;
+    }
+
     QList<ProjectExplorer::Task> reportIssues(const QString &projectPath,
                                               const QString &buildDir) const
     {

src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp

@@ -163,7 +163,17 @@ QList<ProjectExplorer::BuildInfo *> QmakeProjectImporter::import(const Utils::Fi
             info->additionalArguments = additionalArguments;
             info->makefile = makefile;
 
-            result << info;
+            bool found = false;
+            foreach (ProjectExplorer::BuildInfo *bInfo, result) {
+                if (*static_cast<QmakeBuildInfo *>(bInfo) == *info) {
+                    found = true;
+                    break;
+                }
+            }
+            if (found)
+                delete info;
+            else
+                result << info;
         }
     }