Title: [147550] trunk/Tools
Revision
147550
Author
[email protected]
Date
2013-04-03 07:15:49 -0700 (Wed, 03 Apr 2013)

Log Message

Fix HAVE(QTTESTSUPPORT) logic

build_qttestsupport has not been added to WEBKIT_CONFIG in detectFeatures,
resulting in HAVE(QTTESTSUPPORT) never being true.
Move that logic down in sanitizeFeatures.

Patch by Pierre Rossi <[email protected]> on 2013-04-03
Rubber-stamped by Tor Arne Vestbø.

* qmake/mkspecs/features/features.prf:

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (147549 => 147550)


--- trunk/Tools/ChangeLog	2013-04-03 13:23:26 UTC (rev 147549)
+++ trunk/Tools/ChangeLog	2013-04-03 14:15:49 UTC (rev 147550)
@@ -1,3 +1,15 @@
+2013-04-03  Pierre Rossi  <[email protected]>
+
+        Fix HAVE(QTTESTSUPPORT) logic
+
+        build_qttestsupport has not been added to WEBKIT_CONFIG in detectFeatures,
+        resulting in HAVE(QTTESTSUPPORT) never being true.
+        Move that logic down in sanitizeFeatures.
+
+        Rubber-stamped by Tor Arne Vestbø.
+
+        * qmake/mkspecs/features/features.prf:
+
 2013-04-03  Carlos Garcia Campos  <[email protected]>
 
         [GTK] Bump required versions of some dependencies

Modified: trunk/Tools/qmake/mkspecs/features/features.prf (147549 => 147550)


--- trunk/Tools/qmake/mkspecs/features/features.prf	2013-04-03 13:23:26 UTC (rev 147549)
+++ trunk/Tools/qmake/mkspecs/features/features.prf	2013-04-03 14:15:49 UTC (rev 147550)
@@ -156,8 +156,6 @@
     enable?(touch_events): WEBKIT_CONFIG += touch_slider
 
 
-    # Minibrowser must be able to query for QtTestSupport
-    build?(qttestsupport): WEBKIT_CONFIG += have_qttestsupport
 
     # ---------------- Sanitize features -------------------
 
@@ -184,5 +182,8 @@
     # Web Audio requires GStreamer.
     !use?(gstreamer): WEBKIT_CONFIG -= web_audio
 
+    # Minibrowser must be able to query for QtTestSupport
+    build?(qttestsupport): WEBKIT_CONFIG += have_qttestsupport
+
     export(WEBKIT_CONFIG)
 }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to