Fix the Qt build.
authormrowe@apple.com <mrowe@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 22 Mar 2008 21:04:07 +0000 (21:04 +0000)
committermrowe@apple.com <mrowe@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 22 Mar 2008 21:04:07 +0000 (21:04 +0000)
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@31233 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/bridge/qt/qt_runtime.cpp
WebKit/qt/ChangeLog
WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp

index cfcf1dd..787a978 100644 (file)
@@ -1,3 +1,10 @@
+2008-03-22  Mark Rowe  <mrowe@apple.com>
+
+        Qt build fix.
+
+        * bridge/qt/qt_runtime.cpp:
+        (KJS::Bindings::valueRealType):
+
 2008-03-22  Eric Seidel  <eric@webkit.org>
 
         Reviewed by mjs.
index eb5e184..c53084e 100644 (file)
@@ -104,7 +104,7 @@ static JSRealType valueRealType(ExecState* exec, JSValue* val)
             return Date;
         else if (object->inherits(&RegExpImp::info))
             return RegExp;
-        else if (object->inherits(&RuntimeObjectImp::info))
+        else if (object->inherits(&RuntimeObjectImp::s_info))
             return QObj;
         return Object;
     }
index b0220de..1acb43b 100644 (file)
@@ -1,3 +1,10 @@
+2008-03-22  Mark Rowe  <mrowe@apple.com>
+
+        Qt build fix.
+
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::):
+
 2008-03-18  Simon Hausmann  <hausmann@webkit.org>
 
         Reviewed by Holger.
index 1da2fab..98edcf8 100644 (file)
@@ -921,11 +921,11 @@ ObjectContentType FrameLoaderClientQt::objectContentType(const KURL& url, const
 }
 
 static const CSSPropertyID qstyleSheetProperties[] = {
-    CSS_PROP_COLOR,
-    CSS_PROP_FONT_FAMILY,
-    CSS_PROP_FONT_SIZE,
-    CSS_PROP_FONT_STYLE,
-    CSS_PROP_FONT_WEIGHT
+    CSSPropertyColor,
+    CSSPropertyFontFamily,
+    CSSPropertyFontSize,
+    CSSPropertyFontStyle,
+    CSSPropertyFontWeight
 };
 
 const unsigned numqStyleSheetProperties = sizeof(qstyleSheetProperties) / sizeof(qstyleSheetProperties[0]);