diff options
| -rw-r--r-- | src/core/core_common.pri | 4 | ||||
| -rw-r--r-- | src/core/core_gyp_generator.pro | 1 | ||||
| -rw-r--r-- | src/process/process.pro | 3 | ||||
| -rw-r--r-- | tests/auto/quick/qmltests/qmltests.pro | 2 | ||||
| -rw-r--r-- | tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp | 5 | ||||
| -rwxr-xr-x | tools/buildscripts/find-included-moc-files | 2 | ||||
| -rwxr-xr-x | tools/buildscripts/find-mocables | 2 | ||||
| -rw-r--r-- | tools/qmake/mkspecs/features/functions.prf | 4 |
8 files changed, 17 insertions, 6 deletions
diff --git a/src/core/core_common.pri b/src/core/core_common.pri index 2e9ee4198..cefde4302 100644 --- a/src/core/core_common.pri +++ b/src/core/core_common.pri @@ -5,4 +5,8 @@ TARGET = QtWebEngineCore QT += qml quick webchannel QT_PRIVATE += quick-private gui-private core-private +# Make QtCreator happy. +CHROMIUM_SRC_DIR = $$QTWEBENGINE_ROOT/$${getChromiumSrcDir()} +INCLUDEPATH += $$CHROMIUM_SRC_DIR + qtHaveModule(positioning):QT += positioning diff --git a/src/core/core_gyp_generator.pro b/src/core/core_gyp_generator.pro index b5722d2d3..c745fd19e 100644 --- a/src/core/core_gyp_generator.pro +++ b/src/core/core_gyp_generator.pro @@ -121,6 +121,7 @@ HEADERS = \ process_main.h \ qrc_protocol_handler_qt.h \ qt_render_view_observer_host.h \ + qtwebenginecoreglobal.h \ render_widget_host_view_qt.h \ render_widget_host_view_qt_delegate.h \ renderer/content_renderer_client_qt.h \ diff --git a/src/process/process.pro b/src/process/process.pro index 1d57a6c40..1a62a4f2c 100644 --- a/src/process/process.pro +++ b/src/process/process.pro @@ -28,7 +28,8 @@ contains(QT_CONFIG, qt_framework) { "$(TARGET) " } else { CONFIG -= app_bundle - DESTDIR = $$MODULE_BASE_OUTDIR/libexec + win32: DESTDIR = $$MODULE_BASE_OUTDIR/bin + else: DESTDIR = $$MODULE_BASE_OUTDIR/libexec QT_PRIVATE += webenginecore } diff --git a/tests/auto/quick/qmltests/qmltests.pro b/tests/auto/quick/qmltests/qmltests.pro index 8f9274095..a8a63fd5a 100644 --- a/tests/auto/quick/qmltests/qmltests.pro +++ b/tests/auto/quick/qmltests/qmltests.pro @@ -52,7 +52,7 @@ OTHER_FILES += \ load(qt_build_paths) -DEFINES += QUICK_TEST_SOURCE_DIR=\"\\\"$$PWD$${QMAKE_DIR_SEP}data\\\"\" +DEFINES += QUICK_TEST_SOURCE_DIR=\\\"$$re_escape($$PWD$${QMAKE_DIR_SEP}data)\\\" !isQMLTestSupportApiEnabled() { PLUGIN_EXTENSION = .so diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp index 970ebf20a..9562871b3 100644 --- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp +++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp @@ -1661,6 +1661,7 @@ void tst_QWebEnginePage::inputMethods_data() QTest::newRow("QGraphicsWebView") << "QGraphicsWebView"; } +#if defined(QWEBENGINEPAGE_INPUTMETHODQUERY) static Qt::InputMethodHints inputMethodHints(QObject* object) { if (QGraphicsObject* o = qobject_cast<QGraphicsObject*>(object)) @@ -1686,6 +1687,7 @@ static void clickOnPage(QWebEnginePage* page, const QPoint& position) QMouseEvent evrel(QEvent::MouseButtonRelease, position, Qt::LeftButton, Qt::NoButton, Qt::NoModifier); page->event(&evrel); } +#endif void tst_QWebEnginePage::inputMethods() { @@ -2827,6 +2829,7 @@ public: protected: virtual QString userAgentForUrl(const QUrl& url) const { + Q_UNUSED(url); return QString("My User Agent\nX-New-Http-Header: Oh Noes!"); } }; @@ -3178,6 +3181,7 @@ void tst_QWebEnginePage::findTextSuccessiveShouldCallAllCallbacks() QVERIFY(spy5.wasCalled()); } +#if defined(QWEBENGINEPAGE_SUPPORTEDCONTENTTYPES) static QString getMimeTypeForExtension(const QString &ext) { QMimeType mimeType = QMimeDatabase().mimeTypeForFile(QStringLiteral("filename.") + ext.toLower(), QMimeDatabase::MatchExtension); @@ -3186,6 +3190,7 @@ static QString getMimeTypeForExtension(const QString &ext) return QString(); } +#endif void tst_QWebEnginePage::supportedContentType() { diff --git a/tools/buildscripts/find-included-moc-files b/tools/buildscripts/find-included-moc-files index e55f3824c..c76360299 100755 --- a/tools/buildscripts/find-included-moc-files +++ b/tools/buildscripts/find-included-moc-files @@ -10,4 +10,4 @@ for f in filter(os.path.isfile, sys.argv[1:]): if m: includedMocs.add(m.group(1)) for moc in includedMocs: - print moc + print(moc) diff --git a/tools/buildscripts/find-mocables b/tools/buildscripts/find-mocables index 7c383cfec..6c709399c 100755 --- a/tools/buildscripts/find-mocables +++ b/tools/buildscripts/find-mocables @@ -23,4 +23,4 @@ for f in filter(os.path.isfile, sys.argv[1:]): if re.match(".*Q_OBJECT", line): mocables.add(f) for mocable in mocables: - print mocable + print(mocable) diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf index ef0320da1..e1864f7b3 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf @@ -22,8 +22,8 @@ defineTest(isPlatformSupported) { } defineTest(isPythonVersionSupported) { - python_major_version = $$system('python -c "import sys; print sys.version_info.major"') - python_minor_version = $$system('python -c "import sys; print sys.version_info.minor"') + python_major_version = $$system('python -c "import sys; print(sys.version_info.major)"') + python_minor_version = $$system('python -c "import sys; print(sys.version_info.minor)"') lessThan(python_major_version, 3): greaterThan(python_major_version, 1): greaterThan(python_minor_version, 6): return(true) skipBuild("Using Python version "$$python_major_version"."$$python_minor_version", but Python version 2 (2.7 or later) is required to build Qt WebEngine.") return(false) |