[Qt] Unreviewed build fix for mac.
authoralexis.menard@openbossa.org <alexis.menard@openbossa.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 27 Jul 2011 14:20:07 +0000 (14:20 +0000)
committeralexis.menard@openbossa.org <alexis.menard@openbossa.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 27 Jul 2011 14:20:07 +0000 (14:20 +0000)
QtKit is now our default media player, the define is WTF_USE_QTKIT and it's not part
of the options passed to build-webkit, therefore DerivedSources should now generate the
includes when it's mac.

* DerivedSources.pro:
* WebCore.pro:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@91843 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/DerivedSources.pro
Source/WebCore/WebCore.pro

index 096ba9d..d2223cf 100644 (file)
@@ -1,3 +1,14 @@
+2011-07-27  Alexis Menard  <alexis.menard@openbossa.org>
+
+        [Qt] Unreviewed build fix for mac.
+
+        QtKit is now our default media player, the define is WTF_USE_QTKIT and it's not part
+        of the options passed to build-webkit, therefore DerivedSources should now generate the
+        includes when it's mac.
+
+        * DerivedSources.pro:
+        * WebCore.pro:
+
 2011-07-27  Yury Semikhatsky  <yurys@chromium.org>
 
         Inspector should support cd(window) in the command line
index 30c2b26..a5e20a9 100644 (file)
@@ -27,7 +27,7 @@ defineTest(addExtraCompiler) {
     return(true)
 }
 
-contains(DEFINES, USE_QTKIT=1) {
+mac {
     SRC_ROOT_DIR = $$replace(PWD, /Source/WebCore, "")
     fwheader_generator.commands = perl $${SRC_ROOT_DIR}/Source/WebKit2/Scripts/generate-forwarding-headers.pl $${SRC_ROOT_DIR}/Source/WebKit2 ../include mac
     fwheader_generator.depends  = $${SRC_ROOT_DIR}/Source/WebKit2/Scripts/generate-forwarding-headers.pl
index 2213bf1..730bb0c 100644 (file)
@@ -3019,7 +3019,7 @@ contains(DEFINES, ENABLE_VIDEO=1) {
             bindings/js/JSAudioConstructor.cpp
     }
 
-    contains(DEFINES, USE_QTKIT=1) {
+    contains(DEFINES, WTF_USE_QTKIT=1) {
         INCLUDEPATH += \
             $$SOURCE_DIR/../WebKitLibraries/