From ada6b1a10932c7f7cdc5c3a9d71626eea9e3f5e0 Mon Sep 17 00:00:00 2001 From: Andras Becsi Date: Tue, 14 Apr 2015 17:34:22 +0200 Subject: Fix QtCreator loading of qtwebengine.pro MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When QtCreator loads qtwebengine.pro some parsing errors are shown if it picks up the system python3 for basic detection. Although we do not plan to support python3 with all of our scripts (since Chromium does not) these simple cases can be fixed by using the function version of python's print. This patch also adds the Chromium source path to the core INCLUDEPATH so that Chromium headers are indexed as well. Change-Id: Ia6dec1c776fdcddf875fb8e814d8fb33b7340989 Reviewed-by: Michael Brüning --- src/core/core_common.pri | 4 ++++ src/core/core_gyp_generator.pro | 1 + tools/buildscripts/find-included-moc-files | 2 +- tools/buildscripts/find-mocables | 2 +- tools/qmake/mkspecs/features/functions.prf | 4 ++-- 5 files changed, 9 insertions(+), 4 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/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) -- cgit v1.2.3