explicitly remove qt_webkit_version.pri when building with -no-webkit

otherwise it would stay around from a possible previous build with
webkit and confuse the heck out of the build system.

Task-number: QTBUG-13459

2 files changed, 3 insertions, 2 deletions

diff --git a/configure b/configure
index f2b6455..b796de9 100755
--- a/configure
+++ b/configure
@@ -7184,6 +7184,7 @@ if [ "$CFG_WEBKIT" = "yes" ]; then
     # The reason we set CFG_WEBKIT, is such that the printed overview of what will be enabled, shows correctly.
     CFG_WEBKIT="yes"
 else
+    rm -f "$outpath/mkspecs/modules/qt_webkit_version.pri"
     CFG_WEBKIT="no"
     QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_WEBKIT"
 fi
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 0d0729b..6e66742 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -2681,11 +2681,11 @@ void Configure::generateOutputVars()
             qtConfig += "audio-backend";
     }
 
+    QString dst = buildPath + "/mkspecs/modules/qt_webkit_version.pri";
+    QFile::remove(dst);
     if (dictionary["WEBKIT"] == "yes") {
         // This include takes care of adding "webkit" to QT_CONFIG.
         QString src = sourcePath + "/src/3rdparty/webkit/WebKit/qt/qt_webkit_version.pri";
-        QString dst = buildPath + "/mkspecs/modules/qt_webkit_version.pri";
-        QFile::remove(dst);
         QFile::copy(src, dst);
     }