diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-16 08:41:37 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-16 08:41:50 (GMT) |
| commit | aa482dcbde0089fe32ca59e39f17e5e44fd8b244 (patch) | |
| tree | ab780e2f6ac7197fc67440c2b7fb9328dbebd4f7 /mkspecs | |
| parent | 4712a3a1ff6192f716d4f6894c6e69386ae55411 (diff) | |
| parent | b2d5f886b36b4f4d317024db7cfd6668e2895cd4 (diff) | |
| download | Qt-aa482dcbde0089fe32ca59e39f17e5e44fd8b244.zip Qt-aa482dcbde0089fe32ca59e39f17e5e44fd8b244.tar.gz Qt-aa482dcbde0089fe32ca59e39f17e5e44fd8b244.tar.bz2 | |
Merge commit oslo-staging-2/4.6 into upstream/4.6
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> |