diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp | 6 | ||||
| -rw-r--r-- | Source/WebKit/qt/WidgetApi/qwebpage.cpp | 9 | ||||
| -rw-r--r-- | Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp | 1 | ||||
| -rw-r--r-- | Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp | 1 | ||||
| -rwxr-xr-x | Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp | 1 | ||||
| -rw-r--r-- | Tools/MiniBrowser/qt/main.cpp | 1 | ||||
| -rw-r--r-- | Tools/QtTestBrowser/qttestbrowser.cpp | 1 | ||||
| -rw-r--r-- | Tools/qmake/mkspecs/features/configure.prf | 1 |
9 files changed, 15 insertions, 8 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/WebCoreSupport/QWebPageAdapter.cpp b/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp index a4e1f7464..962c8b062 100644 --- a/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp +++ b/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp @@ -363,8 +363,12 @@ void QWebPageAdapter::setNetworkAccessManager(QNetworkAccessManager *manager) QNetworkAccessManager* QWebPageAdapter::networkAccessManager() { - if (!networkManager) + if (!networkManager) { networkManager = new QNetworkAccessManager(handle()); +#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0) + networkManager->setStrictTransportSecurityEnabled(true); +#endif + } return networkManager; } diff --git a/Source/WebKit/qt/WidgetApi/qwebpage.cpp b/Source/WebKit/qt/WidgetApi/qwebpage.cpp index 388456616..1f828a7ad 100644 --- a/Source/WebKit/qt/WidgetApi/qwebpage.cpp +++ b/Source/WebKit/qt/WidgetApi/qwebpage.cpp @@ -3134,7 +3134,7 @@ bool QWebPage::extension(Extension extension, const ExtensionOption *option, Ext if (extension == ChooseMultipleFilesExtension) { // FIXME: do not ignore suggestedFiles QStringList suggestedFiles = static_cast<const ChooseMultipleFilesExtensionOption*>(option)->suggestedFileNames; - QStringList names = QFileDialog::getOpenFileNames(view(), QString::null); + QStringList names = QFileDialog::getOpenFileNames(view(), QString()); static_cast<ChooseMultipleFilesExtensionReturn*>(output)->fileNames = names; return true; } @@ -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))); } /*! @@ -3208,9 +3209,9 @@ QString QWebPage::chooseFile(QWebFrame *parentFrame, const QString& suggestedFil { Q_UNUSED(parentFrame); #ifndef QT_NO_FILEDIALOG - return QFileDialog::getOpenFileName(view(), QString::null, suggestedFile); + return QFileDialog::getOpenFileName(view(), QString(), suggestedFile); #else - return QString::null; + return QString(); #endif } diff --git a/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp b/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp index f792befcd..17bc703fc 100644 --- a/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp +++ b/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp @@ -30,7 +30,6 @@ #include <QComboBox> #include <QPaintEngine> #include <QPicture> -#include <QRegExp> #include <QNetworkRequest> #include <QNetworkReply> #include <QTextCodec> diff --git a/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp b/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp index 53e655749..e1b41bd82 100644 --- a/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp +++ b/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp @@ -29,6 +29,7 @@ #include <QMenu> #include <QMimeDatabase> #include <QPushButton> +#include <QRegExp> #include <QStateMachine> #include <QStyle> #include <QtTest/QtTest> diff --git a/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp b/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp index c0c285353..384902f2e 100755 --- a/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp +++ b/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp @@ -64,6 +64,7 @@ #include <QPrinter> #endif #include <QProgressBar> +#include <QRegExp> #include <QUndoStack> #include <QUrl> #include <limits.h> diff --git a/Tools/MiniBrowser/qt/main.cpp b/Tools/MiniBrowser/qt/main.cpp index 4c8cd92ab..b688aa7ef 100644 --- a/Tools/MiniBrowser/qt/main.cpp +++ b/Tools/MiniBrowser/qt/main.cpp @@ -35,7 +35,6 @@ #include <QDir> #include <QLatin1String> -#include <QRegExp> int main(int argc, char** argv) { diff --git a/Tools/QtTestBrowser/qttestbrowser.cpp b/Tools/QtTestBrowser/qttestbrowser.cpp index 7f96b5a65..2978d39a3 100644 --- a/Tools/QtTestBrowser/qttestbrowser.cpp +++ b/Tools/QtTestBrowser/qttestbrowser.cpp @@ -48,6 +48,7 @@ WindowOptions windowOptions; #include <QFile> #include <QFileInfo> #include <QFontDatabase> +#include <QRegExp> int launcherMain(const QApplication& app) { 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): \ |