summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@theqtcompany.com>2015-04-14 17:34:22 +0200
committerAndras Becsi <andras.becsi@theqtcompany.com>2015-04-15 11:33:46 +0000
commitada6b1a10932c7f7cdc5c3a9d71626eea9e3f5e0 (patch)
treec504afa4790900ba060f3a0d0aba76e843b483d7
parentd65bd6b6bad8de8eeebf88ba6ccd93a50f78a172 (diff)
Fix QtCreator loading of qtwebengine.pro
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 <michael.bruning@theqtcompany.com>
-rw-r--r--src/core/core_common.pri4
-rw-r--r--src/core/core_gyp_generator.pro1
-rwxr-xr-xtools/buildscripts/find-included-moc-files2
-rwxr-xr-xtools/buildscripts/find-mocables2
-rw-r--r--tools/qmake/mkspecs/features/functions.prf4
5 files changed, 9 insertions, 4 deletions
diff --git a/src/core/core_common.pri b/src/core/core_common.pri
index 2e9ee419..cefde430 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 b5722d2d..c745fd19 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 e55f3824..c7636029 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 7c383cfe..6c709399 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 ef0320da..e1864f7b 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)