From b73669cdc3c3169e8527b2c43613c6622a8bb134 Mon Sep 17 00:00:00 2001 From: "mrowe@apple.com" Date: Sat, 22 Mar 2008 21:04:07 +0000 Subject: [PATCH] Fix the Qt build. git-svn-id: https://svn.webkit.org/repository/webkit/trunk@31233 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- WebCore/ChangeLog | 7 +++++++ WebCore/bridge/qt/qt_runtime.cpp | 2 +- WebKit/qt/ChangeLog | 7 +++++++ WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp | 10 +++++----- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog index cfcf1dd..787a978 100644 --- a/WebCore/ChangeLog +++ b/WebCore/ChangeLog @@ -1,3 +1,10 @@ +2008-03-22 Mark Rowe + + Qt build fix. + + * bridge/qt/qt_runtime.cpp: + (KJS::Bindings::valueRealType): + 2008-03-22 Eric Seidel Reviewed by mjs. diff --git a/WebCore/bridge/qt/qt_runtime.cpp b/WebCore/bridge/qt/qt_runtime.cpp index eb5e184..c53084e 100644 --- a/WebCore/bridge/qt/qt_runtime.cpp +++ b/WebCore/bridge/qt/qt_runtime.cpp @@ -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; } diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog index b0220de..1acb43b 100644 --- a/WebKit/qt/ChangeLog +++ b/WebKit/qt/ChangeLog @@ -1,3 +1,10 @@ +2008-03-22 Mark Rowe + + Qt build fix. + + * WebCoreSupport/FrameLoaderClientQt.cpp: + (WebCore::): + 2008-03-18 Simon Hausmann Reviewed by Holger. diff --git a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp index 1da2fab..98edcf8 100644 --- a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp +++ b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp @@ -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]); -- 1.8.3.1