diff --git a/doc/images/qtcreator-modeleditor-classes.png b/doc/images/qtcreator-modeleditor-classes.png
index 182a1596e88..32aff713ef8 100644
Binary files a/doc/images/qtcreator-modeleditor-classes.png and b/doc/images/qtcreator-modeleditor-classes.png differ
diff --git a/doc/images/qtcreator-modeleditor-packages.png b/doc/images/qtcreator-modeleditor-packages.png
index 50ba8f86d6c..07b31e8552b 100644
Binary files a/doc/images/qtcreator-modeleditor-packages.png and b/doc/images/qtcreator-modeleditor-packages.png differ
diff --git a/doc/images/qtcreator-modeleditor.png b/doc/images/qtcreator-modeleditor.png
index 52a404f59db..447c210c2e9 100644
Binary files a/doc/images/qtcreator-modeleditor.png and b/doc/images/qtcreator-modeleditor.png differ
diff --git a/src/libs/qmleditorwidgets/contextpanewidgetborderimage.ui b/src/libs/qmleditorwidgets/contextpanewidgetborderimage.ui
index df35b99cdd4..8bd14156cba 100644
--- a/src/libs/qmleditorwidgets/contextpanewidgetborderimage.ui
+++ b/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>
diff --git a/src/libs/qmleditorwidgets/images/tile-icon-hor - scale.png b/src/libs/qmleditorwidgets/images/tile-icon-hor-scale.png
similarity index 100%
rename from src/libs/qmleditorwidgets/images/tile-icon-hor - scale.png
rename to src/libs/qmleditorwidgets/images/tile-icon-hor-scale.png
diff --git a/src/libs/qmleditorwidgets/resources.qrc b/src/libs/qmleditorwidgets/resources.qrc
index 5ac07864815..d8bea3895c6 100644
--- a/src/libs/qmleditorwidgets/resources.qrc
+++ b/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>
diff --git a/src/plugins/projectexplorer/abi.cpp b/src/plugins/projectexplorer/abi.cpp
index e287de6f556..7835788c0bc 100644
--- a/src/plugins/projectexplorer/abi.cpp
+++ b/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;
diff --git a/src/plugins/projectexplorer/projectexplorer.pro b/src/plugins/projectexplorer/projectexplorer.pro
index e519159666c..5c91002043a 100644
--- a/src/plugins/projectexplorer/projectexplorer.pro
+++ b/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
diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs
index dd43d0d1ece..884444a52e7 100644
--- a/src/plugins/projectexplorer/projectexplorer.qbs
+++ b/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: [
diff --git a/src/plugins/qtsupport/QtSupport.json.in b/src/plugins/qtsupport/QtSupport.json.in
index 9198b0d5a36..6ee539dc311 100644
--- a/src/plugins/qtsupport/QtSupport.json.in
+++ b/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\'/>\",