diff --git a/.qmake.conf b/.qmake.conf
index 17dbc553bb..b6433664d8 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,5 +1,8 @@
 load(qt_build_config)
 CONFIG += qt_example_installs
 
+QT_SOURCE_TREE = $$PWD
+QT_BUILD_TREE = $$shadowed($$PWD)
+
 # In qtbase, all modules follow qglobal.h
 MODULE_VERSION = $$QT_VERSION
diff --git a/configure b/configure
index 9cbb6ff7fb..ba6248eba8 100755
--- a/configure
+++ b/configure
@@ -6668,24 +6668,6 @@ else
     mv -f "$QTMODULE.tmp" "$QTMODULE"
 fi
 
-#-------------------------------------------------------------------------------
-# save configuration into .qmake.cache
-#-------------------------------------------------------------------------------
-
-CACHEFILE="$outpath/.qmake.cache"
-[ -f "$CACHEFILE.tmp" ] && rm -f "$CACHEFILE.tmp"
-cat >>"$CACHEFILE.tmp" <<EOF
-QT_SOURCE_TREE = \$\$quote($relpath)
-QT_BUILD_TREE = \$\$quote($outpath)
-EOF
-
-# replace .qmake.cache if it differs from the newly created temp file
-if cmp -s "$CACHEFILE.tmp" "$CACHEFILE"; then
-    rm -f "$CACHEFILE.tmp"
-else
-    mv -f "$CACHEFILE.tmp" "$CACHEFILE"
-fi
-
 #-------------------------------------------------------------------------------
 # give feedback on configuration
 #-------------------------------------------------------------------------------
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index de91a1558d..7a14043d75 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -2812,17 +2812,6 @@ void Configure::generateOutputVars()
 
 void Configure::generateCachefile()
 {
-    // Generate .qmake.cache
-    {
-        FileWriter cacheStream(buildPath + "/.qmake.cache");
-
-        cacheStream << "QT_SOURCE_TREE = " << formatPath(dictionary["QT_SOURCE_TREE"]) << endl;
-        cacheStream << "QT_BUILD_TREE = " << formatPath(dictionary["QT_BUILD_TREE"]) << endl;
-
-        if (!cacheStream.flush())
-            dictionary[ "DONE" ] = "error";
-    }
-
     // Generate qmodule.pri
     {
         FileWriter moduleStream(dictionary[ "QT_BUILD_TREE" ] + "/mkspecs/qmodule.pri");