Merge remote-tracking branch 'origin/4.5' into 4.6

Conflicts:
	src/shared/qbs

Change-Id: Ib734825a302efe41021307d7d64eb7b453262dc4

src/libs/qmleditorwidgets/contextpanewidgetborderimage.ui

@@ -193,7 +193,7 @@
         </property>
         <property name="icon">
          <iconset resource="resources.qrc">
-          <normaloff>:/qmldesigner/images/tile-icon-hor - scale.png</normaloff>:/qmldesigner/images/tile-icon-hor - scale.png</iconset>
+          <normaloff>:/qmldesigner/images/tile-icon-hor-scale.png</normaloff>:/qmldesigner/images/tile-icon-hor-scale.png</iconset>
         </property>
         <property name="iconSize">
          <size>

src/libs/qmleditorwidgets/resources.qrc

@@ -35,7 +35,7 @@
         <file>images/aspect-crop-icon.png</file>
         <file>images/tile-icon-vert-crop.png</file>
         <file>images/tile-icon-hor-crop.png</file>
-        <file>images/tile-icon-hor - scale.png</file>
+        <file>images/tile-icon-hor-scale.png</file>
         <file>images/tile-icon-vert-scale.png</file>
         <file>images/anchor_bottom.png</file>
         <file>images/anchor_bottom@2x.png</file>

src/plugins/projectexplorer/abi.cpp

@@ -51,6 +51,27 @@ namespace ProjectExplorer {
 // Helpers
 // --------------------------------------------------------------------------
 
+static Abi::Architecture architectureFromQt()
+{
+    const QString arch = QSysInfo::buildCpuArchitecture();
+    if (arch.startsWith("arm"))
+        return Abi::ArmArchitecture;
+    if (arch.startsWith("x86") || arch == "i386")
+        return Abi::X86Architecture;
+    if (arch == "ia64")
+        return Abi::ItaniumArchitecture;
+    if (arch.startsWith("mips"))
+        return Abi::MipsArchitecture;
+    if (arch.startsWith("power"))
+        return Abi::PowerPCArchitecture;
+    if (arch.startsWith("sh")) // Not in Qt documentation!
+        return Abi::ShArchitecture;
+    if (arch.startsWith("avr")) // Not in Qt documentation!
+        return Abi::AvrArchitecture;
+
+    return Abi::UnknownArchitecture;
+}
+
 static quint8 getUint8(const QByteArray &data, int pos)
 {
     return static_cast<quint8>(data.at(pos));
@@ -840,7 +861,7 @@ Abi::OSFlavor Abi::flavorForMsvcVersion(int version)
 
 Abi Abi::hostAbi()
 {
-    Architecture arch = QTC_CPU; // define set by qmake
+    Architecture arch = architectureFromQt();
     OS os = UnknownOS;
     OSFlavor subos = UnknownFlavor;
     BinaryFormat format = UnknownFormat;

src/plugins/projectexplorer/projectexplorer.pro

@@ -332,11 +332,4 @@ journald {
 
 RESOURCES += projectexplorer.qrc
 
-# Some way to override the architecture used in Abi:
-!isEmpty($$(QTC_CPU)) {
-    DEFINES += QTC_CPU=$$(QTC_CPU)
-} else {
-    DEFINES += QTC_CPU=X86Architecture
-}
-
 DEFINES += PROJECTEXPLORER_LIBRARY

src/plugins/projectexplorer/projectexplorer.qbs

@@ -15,8 +15,6 @@ Project {
         Depends { name: "TextEditor" }
         Depends { name: "app_version_header" }
 
-        cpp.defines: base.concat("QTC_CPU=X86Architecture")
-
         Group {
             name: "General"
             files: [

src/plugins/qtsupport/QtSupport.json.in

@@ -25,13 +25,6 @@
         \"    <comment>Linguist compiled translations</comment>\",
         \"    <glob pattern=\'*.qm\'/>\",
         \"  </mime-type>\",
-        \"  <mime-type type=\'application/x-linguist\'>\",
-        \"    <comment>Linguist source translations</comment>\",
-        \"    <magic>\",
-        \"      <match value=\'&lt;TS\' type=\'string\' offset=\'0:256\'/>\",
-        \"    </magic>\",
-        \"    <glob pattern=\'*.ts\' weight=\'70\'/>\",
-        \"  </mime-type>\",
         \"  <mime-type type=\'application/scxml+xml\'>\",
         \"    <comment>SCXML State Chart</comment>\",
         \"    <sub-class-of type=\'application/xml\'/>\",