diff --git a/dist/changes-4.5.2.md b/dist/changes-4.5.2.md
new file mode 100644
index 00000000000..5db8cf13eef
--- /dev/null
+++ b/dist/changes-4.5.2.md
@@ -0,0 +1,18 @@
+Qt Creator version 4.5.2 contains bug fixes.
+
+The most important changes are listed in this document. For a complete
+list of changes, see the Git log for the Qt Creator sources that
+you can check out from the public Git repository. For example:
+
+    git clone git://code.qt.io/qt-creator/qt-creator.git
+    git log --cherry-pick --pretty=oneline v4.5.1..v4.5.2
+
+General
+
+* Added workaround for Qt bug that made summary progress bar and some other
+  controls disappear (QTCREATORBUG-19716)
+
+All Projects
+
+* Improved automatic selection of tool chain for desktop kits when a
+  cross-compilation tool chain has the same ABI as the host
diff --git a/qbs/imports/QtcAutotest.qbs b/qbs/imports/QtcAutotest.qbs
index cb914f7ef1c..4e47b528abc 100644
--- a/qbs/imports/QtcAutotest.qbs
+++ b/qbs/imports/QtcAutotest.qbs
@@ -16,9 +16,7 @@ QtcProduct {
         project.buildDirectory + '/' + qtc.ide_plugin_path
     ]
     cpp.defines: base.filter(function(d) {
-        return d !== "QT_RESTRICTED_CAST_FROM_ASCII"
-            && d !== "QT_USE_FAST_OPERATOR_PLUS"
-            && d !== "QT_USE_FAST_CONCATENATION";
+        return d !== "QT_RESTRICTED_CAST_FROM_ASCII";
     })
 
     Group {
diff --git a/qtcreator.pri b/qtcreator.pri
index de815b131ec..9e681b65cbe 100644
--- a/qtcreator.pri
+++ b/qtcreator.pri
@@ -6,7 +6,7 @@ QTCREATOR_COMPAT_VERSION = 4.6.82
 VERSION = $$QTCREATOR_VERSION
 QTCREATOR_DISPLAY_VERSION = 4.7.0-beta1
 QTCREATOR_COPYRIGHT_YEAR = 2018
-BINARY_ARTIFACTS_BRANCH = master
+BINARY_ARTIFACTS_BRANCH = 4.6
 
 isEmpty(IDE_DISPLAY_NAME):           IDE_DISPLAY_NAME = Qt Creator
 isEmpty(IDE_ID):                     IDE_ID = qtcreator
diff --git a/src/plugins/projectexplorer/foldernavigationwidget.cpp b/src/plugins/projectexplorer/foldernavigationwidget.cpp
index 43dbf18aa07..cafa8cd5cd1 100644
--- a/src/plugins/projectexplorer/foldernavigationwidget.cpp
+++ b/src/plugins/projectexplorer/foldernavigationwidget.cpp
@@ -273,6 +273,7 @@ FolderNavigationWidget::FolderNavigationWidget(QWidget *parent) : QWidget(parent
     setHiddenFilesFilter(false);
     m_showBreadCrumbsAction->setCheckable(true);
     setShowBreadCrumbs(true);
+    m_listView->setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);
     m_listView->setIconSize(QSize(16,16));
     m_listView->setModel(m_fileSystemModel);
     m_listView->setEditTriggers(QAbstractItemView::NoEditTriggers);
diff --git a/src/plugins/projectexplorer/projectmodels.cpp b/src/plugins/projectexplorer/projectmodels.cpp
index a6512d0b3bc..558ae45a6a0 100644
--- a/src/plugins/projectexplorer/projectmodels.cpp
+++ b/src/plugins/projectexplorer/projectmodels.cpp
@@ -86,7 +86,9 @@ FlatModel::FlatModel(QObject *parent)
     connect(sm, &SessionManager::aboutToSaveSession, this, &FlatModel::saveExpandData);
     connect(sm, &SessionManager::projectAdded, this, &FlatModel::handleProjectAdded);
     connect(sm, &SessionManager::startupProjectChanged, this, [this] { layoutChanged(); });
-    rebuildModel();
+
+    for (Project *project : SessionManager::projects())
+        handleProjectAdded(project);
 }
 
 QVariant FlatModel::data(const QModelIndex &index, int role) const
diff --git a/tests/auto/json/json.qbs b/tests/auto/json/json.qbs
index 3b0a36e1411..6ebb9ce4381 100644
--- a/tests/auto/json/json.qbs
+++ b/tests/auto/json/json.qbs
@@ -7,6 +7,11 @@ QtcAutotest {
 
     consoleApplication: true
 
+    cpp.defines: base.filter(function(d) {
+        return d !== "QT_USE_FAST_OPERATOR_PLUS"
+            && d !== "QT_USE_FAST_CONCATENATION";
+    })
+
     Group {
         name: "test data"
         files: [
diff --git a/tests/auto/utils/stringutils/stringutils.qbs b/tests/auto/utils/stringutils/stringutils.qbs
index 4a36fe9cb1f..67dae5f643e 100644
--- a/tests/auto/utils/stringutils/stringutils.qbs
+++ b/tests/auto/utils/stringutils/stringutils.qbs
@@ -3,5 +3,9 @@ import qbs
 QtcAutotest {
     name: "StringUtils autotest"
     Depends { name: "Utils" }
+    cpp.defines: base.filter(function(d) {
+        return d !== "QT_USE_FAST_OPERATOR_PLUS"
+            && d !== "QT_USE_FAST_CONCATENATION";
+    })
     files: "tst_stringutils.cpp"
 }
diff --git a/tests/auto/utils/templateengine/templateengine.qbs b/tests/auto/utils/templateengine/templateengine.qbs
index b31ebdcd1b2..f3c719a168f 100644
--- a/tests/auto/utils/templateengine/templateengine.qbs
+++ b/tests/auto/utils/templateengine/templateengine.qbs
@@ -3,5 +3,9 @@ import qbs
 QtcAutotest {
     name: "TemplateEngine autotest"
     Depends { name: "Utils" }
+    cpp.defines: base.filter(function(d) {
+        return d !== "QT_USE_FAST_OPERATOR_PLUS"
+            && d !== "QT_USE_FAST_CONCATENATION";
+    })
     files: "tst_templateengine.cpp"
 }