summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2009-08-06 11:47:25 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2009-08-06 11:50:29 (GMT)
commit392ad41ba0c0d61d65e2c218ebf3b1a951a4c30a (patch)
tree6382e1976a128acdf8dbc3cc5d52494282683f50
parent1b7d4d29d970405d5559c5641260ea1f09375b27 (diff)
downloadQt-392ad41ba0c0d61d65e2c218ebf3b1a951a4c30a.zip
Qt-392ad41ba0c0d61d65e2c218ebf3b1a951a4c30a.tar.gz
Qt-392ad41ba0c0d61d65e2c218ebf3b1a951a4c30a.tar.bz2
Fix WebKit compilation outside of Qt.
WebKit's .pro file uses shell commands that use QMAKE_MOVE/MOVE. The Symbian generator propagates DEL_FILE, but forgot to also propagate MOVE, like it is done for example in unixmake2.cpp.
-rw-r--r--qmake/generators/symbian/symmake_abld.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/qmake/generators/symbian/symmake_abld.cpp b/qmake/generators/symbian/symmake_abld.cpp
index 17c365d..e537df9 100644
--- a/qmake/generators/symbian/symmake_abld.cpp
+++ b/qmake/generators/symbian/symmake_abld.cpp
@@ -190,6 +190,7 @@ void SymbianAbldMakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, bool
t << "QMAKE = " << Option::fixPathToTargetOS(var("QMAKE_QMAKE")) << endl;
t << "DEL_FILE = " << var("QMAKE_DEL_FILE") << endl;
t << "DEL_DIR = " << var("QMAKE_DEL_DIR") << endl;
+ t << "MOVE = " << var("QMAKE_MOVE") << endl;
t << "XCOPY = xcopy /d /f /h /r /y /i" << endl;
t << "ABLD = ABLD.BAT" << endl;
t << "DEBUG_PLATFORMS = " << debugPlatforms.join(" ") << endl;