diff --git a/src/core/core_common.pri b/src/core/core_common.pri index 2e9ee4198d017e5f314aa6be78f5a23c0e8126d8..cefde4302cd0d111cc591156ac998f2c743081b3 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 b5722d2d359d195c30d1c391f3770ceac235626d..c745fd19ef7ba8b76b87f4df0607fcf9e5c449c9 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/tools/buildscripts/find-included-moc-files b/tools/buildscripts/find-included-moc-files index e55f3824c0462adafb1d7a19d32154e3c457834b..c76360299957ff1b898147d93c757d0cd12bc27b 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 7c383cfec1aacbda26ada443bf005051999a6c73..6c709399c8f44a48135d5e7cbe4129efb72898cf 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 ef0320da1af0bff25551c1288e7b4b982e6a74f7..e1864f7b340dbcdc0dfcf48170865f77588a56d4 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)