diff --git a/qtcreator.pro b/qtcreator.pro
index 0ade76ddb84ea34474114deb400d4eb873419a92..54dd26060f3c2d5c46cd5ec8cea6c274e5d76f1b 100644
--- a/qtcreator.pro
+++ b/qtcreator.pro
@@ -19,6 +19,14 @@ OTHER_FILES += dist/copyright_template.txt \
     qtcreator.qbp \
     qbs/pluginspec/pluginspec.qbs
 
+qmake_cache = $$targetPath($$IDE_BUILD_TREE/.qmake.cache)
+unix: maybe_quote = \"
+system("echo $${maybe_quote}$${LITERAL_HASH} config for qmake$${maybe_quote} > $$qmake_cache")
+# Make sure the qbs dll ends up alongside the Creator executable.
+win32:exists(src/shared/qbs/qbs.pro) {
+    system("echo QBS_DLLDESTDIR = $${IDE_BUILD_TREE}/bin >> $$qmake_cache")
+}
+
 contains(QT_ARCH, i386): ARCHITECTURE = x86
 else: ARCHITECTURE = $$QT_ARCH