diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2009-09-18 13:37:32 (GMT) |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2009-09-18 13:59:19 (GMT) |
| commit | c23ad8747cde25fa3c56d0d0e46b21d15ee3a05d (patch) | |
| tree | fa9e4d0744b77f74f39e3418873c3e865ec795bf /src/3rdparty | |
| parent | b9b8a1cb6bc5a1b93373a7a634a23dcd785b3c31 (diff) | |
| download | Qt-c23ad8747cde25fa3c56d0d0e46b21d15ee3a05d.zip Qt-c23ad8747cde25fa3c56d0d0e46b21d15ee3a05d.tar.gz Qt-c23ad8747cde25fa3c56d0d0e46b21d15ee3a05d.tar.bz2 | |
QtWebKit Windows CE compile fixes
Reviewed-by: Simon Hausmann
Diffstat (limited to 'src/3rdparty')
5 files changed, 8 insertions, 6 deletions
diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/BitmapImage.h b/src/3rdparty/webkit/WebCore/platform/graphics/BitmapImage.h index cc3d775..0f3f9aa 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/BitmapImage.h +++ b/src/3rdparty/webkit/WebCore/platform/graphics/BitmapImage.h @@ -166,7 +166,7 @@ protected: #endif virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, CompositeOperator); -#if PLATFORM(WX) || PLATFORM(WINCE) +#if PLATFORM(WX) || (PLATFORM(WINCE) && !PLATFORM(QT)) virtual void drawPattern(GraphicsContext*, const FloatRect& srcRect, const TransformationMatrix& patternTransform, const FloatPoint& phase, CompositeOperator, const FloatRect& destRect); #endif diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/FontCache.h b/src/3rdparty/webkit/WebCore/platform/graphics/FontCache.h index a591474..b88305f 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/FontCache.h +++ b/src/3rdparty/webkit/WebCore/platform/graphics/FontCache.h @@ -64,7 +64,7 @@ public: // Also implemented by the platform. void platformInit(); -#if PLATFORM(WINCE) +#if PLATFORM(WINCE) && !PLATFORM(QT) #if defined(IMLANG_FONT_LINK) && (IMLANG_FONT_LINK == 2) IMLangFontLink2* getFontLinkInterface(); #else diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/MediaPlayer.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/MediaPlayer.cpp index 20dbc00..23410b2 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/MediaPlayer.cpp +++ b/src/3rdparty/webkit/WebCore/platform/graphics/MediaPlayer.cpp @@ -39,7 +39,7 @@ #if PLATFORM(MAC) #include "MediaPlayerPrivateQTKit.h" -#elif PLATFORM(WINCE) +#elif PLATFORM(WINCE) && !PLATFORM(QT) #include "MediaPlayerPrivateWince.h" #elif PLATFORM(WIN) #include "MediaPlayerPrivateQuickTimeWin.h" diff --git a/src/3rdparty/webkit/WebCore/platform/text/TextEncodingRegistry.cpp b/src/3rdparty/webkit/WebCore/platform/text/TextEncodingRegistry.cpp index 5ab1c87..5d82511 100644 --- a/src/3rdparty/webkit/WebCore/platform/text/TextEncodingRegistry.cpp +++ b/src/3rdparty/webkit/WebCore/platform/text/TextEncodingRegistry.cpp @@ -48,7 +48,7 @@ #if PLATFORM(QT) #include "qt/TextCodecQt.h" #endif -#if PLATFORM(WINCE) +#if PLATFORM(WINCE) && !PLATFORM(QT) #include "TextCodecWince.h" #endif @@ -194,7 +194,7 @@ static void buildBaseTextCodecMaps() TextCodecICU::registerBaseCodecs(addToTextCodecMap); #endif -#if PLATFORM(WINCE) +#if PLATFORM(WINCE) && !PLATFORM(QT) TextCodecWince::registerBaseEncodingNames(addToTextEncodingNameMap); TextCodecWince::registerBaseCodecs(addToTextCodecMap); #endif @@ -217,7 +217,7 @@ static void extendTextCodecMaps() TextCodecMac::registerCodecs(addToTextCodecMap); #endif -#if PLATFORM(WINCE) +#if PLATFORM(WINCE) && !PLATFORM(QT) TextCodecWince::registerExtendedEncodingNames(addToTextEncodingNameMap); TextCodecWince::registerExtendedCodecs(addToTextCodecMap); #endif diff --git a/src/3rdparty/webkit/WebCore/plugins/PluginView.cpp b/src/3rdparty/webkit/WebCore/plugins/PluginView.cpp index c28e586..28572a4 100644 --- a/src/3rdparty/webkit/WebCore/plugins/PluginView.cpp +++ b/src/3rdparty/webkit/WebCore/plugins/PluginView.cpp @@ -289,6 +289,7 @@ void PluginView::stop() JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly); +#if ENABLE(NETSCAPE_PLUGIN_API) #if !PLATFORM(WX) // FIXME: Revisit this when implementing plugins for wx #ifdef XP_WIN // Unsubclass the window @@ -307,6 +308,7 @@ void PluginView::stop() } #endif // XP_WIN #endif // !PLATFORM(WX) +#endif // ENABLE(NETSCAPE_PLUGIN_API) #if !defined(XP_MACOSX) // Clear the window |