From 392ad41ba0c0d61d65e2c218ebf3b1a951a4c30a Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 6 Aug 2009 13:47:25 +0200 Subject: 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. --- qmake/generators/symbian/symmake_abld.cpp | 1 + 1 file changed, 1 insertion(+) 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; -- cgit v0.12 From ed35633a5953d9d1f52b910347c778a5ddc622d2 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 6 Aug 2009 13:52:31 +0200 Subject: Fix WebKit compilation outside of Qt with SBS. Propagate QMAKE_MOVE similar to commit 392ad41ba0c0d61d65e2c218ebf3b1a951a4c30a. Reviewed-by: Miikka Heikkinen --- qmake/generators/symbian/symmake_sbsv2.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/qmake/generators/symbian/symmake_sbsv2.cpp b/qmake/generators/symbian/symmake_sbsv2.cpp index 34585e8..885d8a6 100644 --- a/qmake/generators/symbian/symmake_sbsv2.cpp +++ b/qmake/generators/symbian/symmake_sbsv2.cpp @@ -133,6 +133,7 @@ void SymbianSbsv2MakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, boo 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 << "DEBUG_PLATFORMS = " << debugPlatforms.join(" ") << endl; t << "RELEASE_PLATFORMS = " << releasePlatforms.join(" ") << endl; t << "MAKE = make" << endl; -- cgit v0.12 From 30adf7d302b75b6af57196932ca619a9c2087db7 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 6 Aug 2009 13:58:57 +0200 Subject: Fix extern WebKit build that uses qmake generators. WebCore.pro's generators use QMAKE_DEL, which when used with del.exe works if the file is present or not. In the QMAKE_SH branch QMAKE_DEL is mapped to rm, which complaints if the file to delete doesn't exist. Similar to del.exe and unix.conf use rm -f instead of rm for QMAKE_DEL in the QMAKE_SH branch. Reviewed-by: Miikka Heikkinen --- mkspecs/common/symbian/symbian.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index 554bf85..65bb69d 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -77,7 +77,7 @@ QMAKE_LIBS_S60 = -lavkon -leikcoctl QMAKE_COPY = cp QMAKE_COPY_DIR = cp -r QMAKE_MOVE = mv - QMAKE_DEL_FILE = rm + QMAKE_DEL_FILE = rm -f QMAKE_MKDIR = mkdir QMAKE_DEL_DIR = rmdir QMAKE_CHK_DIR_EXISTS = test -d -- cgit v0.12