diff options
| author | Shane Kearns <shane.kearns@sosco.com> | 2009-11-09 13:22:17 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@sosco.com> | 2009-11-09 15:27:45 (GMT) |
| commit | a674879a8e070a8fbb85110c0bba3eed212c16b4 (patch) | |
| tree | 3a1a4fa28c269211836fba8292e7a891bf17ffe3 /mkspecs | |
| parent | bcd7d54abc06e5a2504aac445e876b4878e59a6d (diff) | |
| download | Qt-a674879a8e070a8fbb85110c0bba3eed212c16b4.zip Qt-a674879a8e070a8fbb85110c0bba3eed212c16b4.tar.gz Qt-a674879a8e070a8fbb85110c0bba3eed212c16b4.tar.bz2 | |
Remove temp dirs workaround for raptor builds only
Webkit cannot build because of too long command lines in the sbsv2 config.
There is an alternative workaround in raptor for the relative include paths
problem, i.e. "sbs -c winscw_udeb.mwccinc"
Removing the temp dirs from being created and added to systeminclude makes the
command line short enough again that webkit can be compiled.
Reviewed-By: Miikka Heikkinen
Based on following commit from the no-tmp-dirs branch:
commit 33e8c420bb40ca6194d29f96ef2fbd0f18340e6b
Author: Iain <qt-info@nokia.com>
Date: Wed Oct 7 13:45:48 2009 +0200
First attempt at removing the tmp dirs workaround on Symbian OS
I may not have caught all the places where it is used, but MMP files
look OK afterwards.
TODO: Slightly concerned that I've trimmed too much from the abld generator
as I think that the bit I cut was also used for other temp dirs
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/symbian-sbsv2/flm/qt/qmake_generate_temp_dirs.flm | 22 | ||||
| -rw-r--r-- | mkspecs/symbian-sbsv2/flm/qt/qt.xml | 5 |
2 files changed, 0 insertions, 27 deletions
diff --git a/mkspecs/symbian-sbsv2/flm/qt/qmake_generate_temp_dirs.flm b/mkspecs/symbian-sbsv2/flm/qt/qmake_generate_temp_dirs.flm deleted file mode 100644 index ca6cca9..0000000 --- a/mkspecs/symbian-sbsv2/flm/qt/qmake_generate_temp_dirs.flm +++ /dev/null @@ -1,22 +0,0 @@ -# /**************************************************************************** -# ** -# ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -# ** Contact: Nokia Corporation (qt-info@nokia.com) -# ** -# ** This file is part of symbian-sbsv2 mkspec. -# ** -# ****************************************************************************/ - -include $(FLMHOME)/metaflm.mk - -SINGLETON:=$(call sanitise,TEMP_DIRS_$(EXTENSION_ROOT)) - -ifeq ($($(SINGLETON)),) -$(SINGLETON):=1 -$(call makepath,$(DIRS)) -$(eval $(call GenerateStandardCleanTarget,'',$(DIRS))) -endif - - - - diff --git a/mkspecs/symbian-sbsv2/flm/qt/qt.xml b/mkspecs/symbian-sbsv2/flm/qt/qt.xml index 5074e47..c99b5e2 100644 --- a/mkspecs/symbian-sbsv2/flm/qt/qt.xml +++ b/mkspecs/symbian-sbsv2/flm/qt/qt.xml @@ -35,11 +35,6 @@ <param name='LINK_TARGET' /> </interface> - <interface name="qt.qmake_generate_temp_dirs" extends="Symbian.UserFLM" - flm="qmake_generate_temp_dirs.flm"> - <param name='DIRS' /> - </interface> - <interface name="qt.qmake_store_build" extends="Symbian.UserFLM" flm="qmake_store_build.flm"> </interface> |