diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | Source/WebCore/Modules/mediasource/MediaSourceRegistry.cpp | 2 | ||||
| -rw-r--r-- | Source/WebCore/WebCore.pri | 1 | ||||
| -rw-r--r-- | Source/WebCore/platform/qt/MIMETypeRegistryQt.cpp | 9 | ||||
| -rw-r--r-- | Source/WebCore/platform/qt/RenderThemeQtMobile.cpp | 2 | ||||
| -rw-r--r-- | Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.h | 2 | ||||
| -rw-r--r-- | Tools/qmake/mkspecs/features/configure.prf | 3 | ||||
| -rw-r--r-- | Tools/qmake/mkspecs/features/default_pre.prf | 2 |
8 files changed, 18 insertions, 5 deletions
diff --git a/.qmake.conf b/.qmake.conf index bffb33969..717d46d44 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -3,4 +3,4 @@ MODULE_QMAKE_OUTDIR = $$shadowed($$PWD/Tools/qmake) QMAKEPATH += $$PWD/Tools/qmake $$MODULE_QMAKE_OUTDIR load(qt_build_config) -MODULE_VERSION = 5.6.2 +MODULE_VERSION = 5.7.1 diff --git a/Source/WebCore/Modules/mediasource/MediaSourceRegistry.cpp b/Source/WebCore/Modules/mediasource/MediaSourceRegistry.cpp index 1c6267467..45459df92 100644 --- a/Source/WebCore/Modules/mediasource/MediaSourceRegistry.cpp +++ b/Source/WebCore/Modules/mediasource/MediaSourceRegistry.cpp @@ -72,7 +72,7 @@ void MediaSourceRegistry::unregisterMediaSourceURL(const KURL& url) MediaSource* MediaSourceRegistry::lookupMediaSource(const String& url) { ASSERT(isMainThread()); - return m_mediaSources.get(url).get(); + return m_mediaSources.get(url); } } // namespace WebCore diff --git a/Source/WebCore/WebCore.pri b/Source/WebCore/WebCore.pri index 01893948e..37cde573a 100644 --- a/Source/WebCore/WebCore.pri +++ b/Source/WebCore/WebCore.pri @@ -16,6 +16,7 @@ INCLUDEPATH += \ $$SOURCE_DIR/Modules/filesystem \ $$SOURCE_DIR/Modules/geolocation \ $$SOURCE_DIR/Modules/indexeddb \ + $$SOURCE_DIR/Modules/mediasource \ $$SOURCE_DIR/Modules/navigatorcontentutils \ $$SOURCE_DIR/Modules/notifications \ $$SOURCE_DIR/Modules/proximity \ diff --git a/Source/WebCore/platform/qt/MIMETypeRegistryQt.cpp b/Source/WebCore/platform/qt/MIMETypeRegistryQt.cpp index 8d167c7b5..aeff0c01d 100644 --- a/Source/WebCore/platform/qt/MIMETypeRegistryQt.cpp +++ b/Source/WebCore/platform/qt/MIMETypeRegistryQt.cpp @@ -29,6 +29,7 @@ #include "config.h" #include "MIMETypeRegistry.h" +#include "NotImplemented.h" #include <QMimeDatabase> #include <wtf/Assertions.h> #include <wtf/MainThread.h> @@ -143,4 +144,12 @@ bool MIMETypeRegistry::isApplicationPluginMIMEType(const String& mimeType) || mimeType.startsWith("application/x-qt-styled-widget", false); } +#if ENABLE(MEDIA_SOURCE) +bool MIMETypeRegistry::isSupportedMediaSourceMIMEType(const String&, const String&) +{ + notImplemented(); + return false; +} +#endif + } diff --git a/Source/WebCore/platform/qt/RenderThemeQtMobile.cpp b/Source/WebCore/platform/qt/RenderThemeQtMobile.cpp index ceee78c65..35e47506f 100644 --- a/Source/WebCore/platform/qt/RenderThemeQtMobile.cpp +++ b/Source/WebCore/platform/qt/RenderThemeQtMobile.cpp @@ -58,8 +58,8 @@ static const int frameWidth = 2; static const int checkBoxWidth = 21; static const int radioWidth = 21; static const int sliderSize = 20; -static const int buttonHeightRatio = 1.5; +static const float buttonHeightRatio = 1.5; static const float multipleComboDotsOffsetFactor = 1.8; static const float buttonPaddingLeft = 18; static const float buttonPaddingRight = 18; diff --git a/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.h b/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.h index 8430a2330..c770f132b 100644 --- a/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.h +++ b/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.h @@ -23,7 +23,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef WebPluginSiteDataManagerh +#ifndef WebPluginSiteDataManager_h #define WebPluginSiteDataManager_h #if ENABLE(NETSCAPE_PLUGIN_API) diff --git a/Tools/qmake/mkspecs/features/configure.prf b/Tools/qmake/mkspecs/features/configure.prf index 49f849576..b5fb2aed8 100644 --- a/Tools/qmake/mkspecs/features/configure.prf +++ b/Tools/qmake/mkspecs/features/configure.prf @@ -129,6 +129,9 @@ defineTest(finalizeConfigure) { production_build:android { addReasonForSkippingBuild("Build not supported on Android.") } + production_build:contains(QT_CONFIG, mirclient) { + addReasonForSkippingBuild("Build not supported on Ubuntu Touch.") + } !gnu_thin_archives:!win32-msvc2013:!mingw:contains(QT_CONFIG, static) { addReasonForSkippingBuild("QtWebKit cannot be built as a static library on this platform. Check your configuration in qtbase/config.summary.") } diff --git a/Tools/qmake/mkspecs/features/default_pre.prf b/Tools/qmake/mkspecs/features/default_pre.prf index 3e6677c92..221937e85 100644 --- a/Tools/qmake/mkspecs/features/default_pre.prf +++ b/Tools/qmake/mkspecs/features/default_pre.prf @@ -102,7 +102,7 @@ gcc:isEqual(QT_ARCH, "arm"): CONFIG -= use_gold_linker # Pick up Qt's defaults for debug/release/debug_and_release if(win32|mac):!macx-xcode { - contains(QT_CONFIG, simulator_and_device): CONFIG += iphonesimulator_and_iphoneos + contains(QT_CONFIG, simulator_and_device): CONFIG += simulator_and_device contains(QT_CONFIG, debug_and_release): CONFIG += debug_and_release contains(QT_CONFIG, build_all): CONFIG += build_all } |