diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-03-05 11:05:05 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-05 15:18:32 +0100 |
| commit | 1d6a09105b8a583893c6bef5089719389a9e62f5 (patch) | |
| tree | 390409b5c741fdb5e8f87faa8c43bc1202213e5a | |
| parent | bdb09f02efc021ed5a9128f9bdf2e25d13ee6738 (diff) | |
| download | qtwebkit-1d6a09105b8a583893c6bef5089719389a9e62f5.tar.gz | |
Fix build with GStreamer 1.0
With GST_API_VERSION_1 the class GStreamerFullScreenVideoHandler was skipped
but still used. This patches changes the defines to be consistent.
The same issue was solved in trunk as part of http://trac.webkit.org/changeset/141265
for https://bugs.webkit.org/show_bug.cgi?id=106760
Change-Id: I9d5b129509052063892fc0d38d8cf8c6d102bfd8
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| -rw-r--r-- | Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h | 2 | ||||
| -rw-r--r-- | Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h b/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h index 122b408fb..2335e6e35 100644 --- a/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h +++ b/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h @@ -160,7 +160,7 @@ public: virtual void needTouchEvents(bool) { } #endif -#if ENABLE(VIDEO) && (USE(GSTREAMER) || USE(QT_MULTIMEDIA) || USE(QTKIT)) +#if ENABLE(VIDEO) && ((USE(GSTREAMER) && !defined(GST_API_VERSION_1)) || USE(QT_MULTIMEDIA) || USE(QTKIT)) virtual bool supportsFullscreenForNode(const Node*); virtual void enterFullscreenForNode(Node*); virtual void exitFullscreenForNode(Node*); diff --git a/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.h b/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.h index 81a288da5..29010ff79 100644 --- a/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.h +++ b/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.h @@ -90,7 +90,7 @@ private: #if USE(QT_MULTIMEDIA) QWebFullScreenVideoHandler* m_FullScreenVideoHandler; #endif -#if USE(GSTREAMER) +#if USE(GSTREAMER) && !defined(GST_API_VERSION_1) GStreamerFullScreenVideoHandler* m_FullScreenVideoHandlerGStreamer; #endif #if USE(QTKIT) |