diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | Source/WebKit/qt/WidgetApi/qwebpage.cpp | 3 | ||||
| -rw-r--r-- | Tools/qmake/mkspecs/features/configure.prf | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/.qmake.conf b/.qmake.conf index 0b7cf949a..cbaba996b 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.8.1 +MODULE_VERSION = 5.9.0 diff --git a/Source/WebKit/qt/WidgetApi/qwebpage.cpp b/Source/WebKit/qt/WidgetApi/qwebpage.cpp index 388456616..60e4d8b7b 100644 --- a/Source/WebKit/qt/WidgetApi/qwebpage.cpp +++ b/Source/WebKit/qt/WidgetApi/qwebpage.cpp @@ -3182,7 +3182,8 @@ QWebPageAdapter *QWebPage::handle() const */ bool QWebPage::findText(const QString &subString, FindFlags options) { - return d->findText(subString, static_cast<QWebPageAdapter::FindFlag>(options.operator int())); + return d->findText(subString, static_cast<QWebPageAdapter::FindFlag>( + static_cast<FindFlags::Int>(options))); } /*! diff --git a/Tools/qmake/mkspecs/features/configure.prf b/Tools/qmake/mkspecs/features/configure.prf index 9eeac75dc..23d99040b 100644 --- a/Tools/qmake/mkspecs/features/configure.prf +++ b/Tools/qmake/mkspecs/features/configure.prf @@ -136,6 +136,7 @@ defineTest(finalizeConfigure) { !gnu_thin_archives:!win32-msvc2013:!mingw:qtConfig(static) { addReasonForSkippingBuild("QtWebKit cannot be built as a static library on this platform. Check your configuration in qtbase/config.summary.") } + uikit: addReasonForSkippingBuild("QtWebKit is not supported on iOS/tvOS/watchOS") winrt: addReasonForSkippingBuild("QtWebKit is not supported on Windows Phone/Windows RT") requiredPrograms = gperf python perl bison ruby flex for(program, requiredPrograms): \ |