diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-09-07 11:38:08 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-09-07 11:47:33 (GMT) |
| commit | cd3b942217b5b1f13d5f666b0a7ac43d14b35950 (patch) | |
| tree | fb671604b6f44e479a01d3fc4ff4d34456a784dd /tools | |
| parent | e032a0730ad752d0855c281f61799ae89fb36ead (diff) | |
| download | Qt-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
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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); } |