diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-21 18:09:08 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-21 18:09:08 +0100 |
| commit | b1153753221513aa5687001c84a1c9ed69925dc6 (patch) | |
| tree | 3569ad54e433fee8244effe558ca52e567b6890d /tools | |
| parent | 4d6b2dc88bda15ade9d04e54d80b7e4693d59832 (diff) | |
| parent | c2687689ba42d6021ae3f220d9fd240609489d3a (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/3rdparty
src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
Change-Id: I90728e965399e51b626d538924de955f9abab5fe
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmake/mkspecs/features/default_pre.prf | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/qmake/mkspecs/features/default_pre.prf b/tools/qmake/mkspecs/features/default_pre.prf index 6506e67ad..cb0625c2e 100644 --- a/tools/qmake/mkspecs/features/default_pre.prf +++ b/tools/qmake/mkspecs/features/default_pre.prf @@ -19,6 +19,9 @@ load(functions) equals(_PRO_FILE_, "$$QTWEBENGINE_ROOT/qtwebengine.pro"): CONFIG += root_project_file root_project_file:isPlatformSupported() { + !exists($$QTWEBENGINE_ROOT/src/3rdparty/chromium) { + error("Submodule qtwebengine-chromium does not exist. Run 'git submodule update --init'.") + } load(configure) runConfigure() } |