diff options
| author | Andras Becsi <andras.becsi@theqtcompany.com> | 2015-04-14 17:34:22 +0200 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@theqtcompany.com> | 2015-04-15 11:33:46 +0000 |
| commit | ada6b1a10932c7f7cdc5c3a9d71626eea9e3f5e0 (patch) | |
| tree | c504afa4790900ba060f3a0d0aba76e843b483d7 /src/core | |
| parent | d65bd6b6bad8de8eeebf88ba6ccd93a50f78a172 (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>
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/core_common.pri | 4 | ||||
| -rw-r--r-- | src/core/core_gyp_generator.pro | 1 |
2 files changed, 5 insertions, 0 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 \ |