summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-09-07 11:38:08 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-09-07 11:47:33 (GMT)
commitcd3b942217b5b1f13d5f666b0a7ac43d14b35950 (patch)
treefb671604b6f44e479a01d3fc4ff4d34456a784dd
parente032a0730ad752d0855c281f61799ae89fb36ead (diff)
downloadQt-cd3b942217b5b1f13d5f666b0a7ac43d14b35950.zip
Qt-cd3b942217b5b1f13d5f666b0a7ac43d14b35950.tar.gz
Qt-cd3b942217b5b1f13d5f666b0a7ac43d14b35950.tar.bz2
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
-rwxr-xr-xconfigure1
-rw-r--r--tools/configure/configureapp.cpp4
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);
}