Commit ada6b1a1 authored by Andras Becsi's avatar Andras Becsi
Browse files

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: default avatarMichael Brüning <michael.bruning@theqtcompany.com>
Showing with 9 additions and 4 deletions
......@@ -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
......@@ -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 \
......
......@@ -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)
......@@ -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)
......@@ -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)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment