From 0857b8ac544c070cb34bb522f7b6a5ec1913718c Mon Sep 17 00:00:00 2001 From: "vestbo@webkit.org" Date: Wed, 27 Jun 2012 14:24:56 +0000 Subject: [PATCH] [Qt] No need to save and restore TEMPLATE in a function MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This was a leftover from when the logic was not in its own function scope. QMAKE_FRAMEWORK_BUNDLE_NAME on the other hand is exported in qtLibraryTarget, which will surprisingly affect the global scope as well, so we have to save and restore it. Original patch by Oswald Buddenhagen on 2012-06-27 Reviewed by Tor Arne Vestbø. * qmake/mkspecs/features/functions.prf: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@121340 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Tools/ChangeLog | 15 +++++++++++++++ Tools/qmake/mkspecs/features/functions.prf | 4 ++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/Tools/ChangeLog b/Tools/ChangeLog index a0b4be7..4c107b4 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,18 @@ +2012-06-27 Tor Arne Vestbø + + [Qt] No need to save and restore TEMPLATE in a function + + This was a leftover from when the logic was not in its own function scope. + + QMAKE_FRAMEWORK_BUNDLE_NAME on the other hand is exported in qtLibraryTarget, which + will surprisingly affect the global scope as well, so we have to save and restore it. + + Original patch by Oswald Buddenhagen on 2012-06-27 + + Reviewed by Tor Arne Vestbø. + + * qmake/mkspecs/features/functions.prf: + 2012-06-27 Oswald Buddenhagen [Qt] Fix lookup location for sqlite sources diff --git a/Tools/qmake/mkspecs/features/functions.prf b/Tools/qmake/mkspecs/features/functions.prf index 527e0d8..f0e9d15 100644 --- a/Tools/qmake/mkspecs/features/functions.prf +++ b/Tools/qmake/mkspecs/features/functions.prf @@ -234,13 +234,13 @@ defineTest(prependEach) { defineReplace(resolveFinalLibraryName) { !debug_and_release: return($$1) - original_template = $$TEMPLATE original_framework_name = $$QMAKE_FRAMEWORK_BUNDLE_NAME TEMPLATE = lib # So that qtLibraryTarget works target = $$qtLibraryTarget($$1) - TEMPLATE = $$original_template + # qtLibraryTarget will export QMAKE_FRAMEWORK_BUNDLE_NAME, which gets + # exported not only to this function scope, but to our call site. QMAKE_FRAMEWORK_BUNDLE_NAME = $$original_framework_name export(QMAKE_FRAMEWORK_BUNDLE_NAME) -- 2.7.4