Title: [121340] trunk/Tools
- Revision
- 121340
- Author
- ves...@webkit.org
- Date
- 2012-06-27 07:24:56 -0700 (Wed, 27 Jun 2012)
Log Message
[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 <oswald.buddenha...@nokia.com> on 2012-06-27
Reviewed by Tor Arne Vestbø.
* qmake/mkspecs/features/functions.prf:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (121339 => 121340)
--- trunk/Tools/ChangeLog 2012-06-27 13:05:43 UTC (rev 121339)
+++ trunk/Tools/ChangeLog 2012-06-27 14:24:56 UTC (rev 121340)
@@ -1,3 +1,18 @@
+2012-06-27 Tor Arne Vestbø <tor.arne.ves...@nokia.com>
+
+ [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 <oswald.buddenha...@nokia.com> on 2012-06-27
+
+ Reviewed by Tor Arne Vestbø.
+
+ * qmake/mkspecs/features/functions.prf:
+
2012-06-27 Oswald Buddenhagen <oswald.buddenha...@nokia.com>
[Qt] Fix lookup location for sqlite sources
Modified: trunk/Tools/qmake/mkspecs/features/functions.prf (121339 => 121340)
--- trunk/Tools/qmake/mkspecs/features/functions.prf 2012-06-27 13:05:43 UTC (rev 121339)
+++ trunk/Tools/qmake/mkspecs/features/functions.prf 2012-06-27 14:24:56 UTC (rev 121340)
@@ -234,13 +234,13 @@
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)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
