Title: [124601] trunk/Tools
Revision
124601
Author
[email protected]
Date
2012-08-03 05:54:23 -0700 (Fri, 03 Aug 2012)

Log Message

[Qt] Always save CONFIG & DEFINES in default_pre

Always doing it is cheaper than checking whether it needs to be done.
apart from that, it would break configuration initiated from another
project.

Patch by Oswald Buddenhagen <[email protected]> on 2012-08-03
Reviewed by Tor Arne Vestbø.

* qmake/mkspecs/features/default_pre.prf:

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (124600 => 124601)


--- trunk/Tools/ChangeLog	2012-08-03 12:25:16 UTC (rev 124600)
+++ trunk/Tools/ChangeLog	2012-08-03 12:54:23 UTC (rev 124601)
@@ -1,3 +1,15 @@
+2012-08-03  Oswald Buddenhagen  <[email protected]>
+
+        [Qt] Always save CONFIG & DEFINES in default_pre
+
+        Always doing it is cheaper than checking whether it needs to be done.
+        apart from that, it would break configuration initiated from another
+        project.
+
+        Reviewed by Tor Arne Vestbø.
+
+        * qmake/mkspecs/features/default_pre.prf:
+
 2012-08-03  Joone Hur  <[email protected]>
 
         [EFL][DRT] fast/loader/stop-provisional-loads.html fails

Modified: trunk/Tools/qmake/mkspecs/features/default_pre.prf (124600 => 124601)


--- trunk/Tools/qmake/mkspecs/features/default_pre.prf	2012-08-03 12:25:16 UTC (rev 124600)
+++ trunk/Tools/qmake/mkspecs/features/default_pre.prf	2012-08-03 12:54:23 UTC (rev 124601)
@@ -27,10 +27,6 @@
 WEBKIT_SUBDIR = $$replace(_PRO_FILE_PWD_, $${ROOT_WEBKIT_DIR},)
 ROOT_BUILD_DIR = $$replace(OUT_PWD, $${WEBKIT_SUBDIR}$,)
 
-# Detect if we're running the initial configure step
-pro_file_name = $$basename(_PRO_FILE_)
-equals(pro_file_name, configure.pro): CONFIG += configure_pass
-
 # We want the QtWebKit API forwarding includes to live in the root build dir.
 MODULE_BASE_DIR = $$ROOT_WEBKIT_DIR
 MODULE_BASE_OUTDIR = $$ROOT_BUILD_DIR
@@ -143,9 +139,7 @@
     FEATURE_DEFINES_JAVASCRIPT += $$enabled_feature_define
 }
 
-configure_pass {
-    # Save the base config and defines so we can compute the delta between
-    # what features.prf introduced and what was already there.
-    BASE_CONFIG = $$CONFIG
-    BASE_DEFINES = $$DEFINES
-}
+# Save the base config and defines so we can compute the delta between
+# what features.prf introduced and what was already there.
+BASE_CONFIG = $$CONFIG
+BASE_DEFINES = $$DEFINES
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to