diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-10 20:45:46 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-10 20:45:46 +0100 |
| commit | 6c090cd8d0e501b340190d96854145deb2299b26 (patch) | |
| tree | 73dbee34347724a55de8180d61caa3e78b512aa3 /qtdeclarative.pro | |
| parent | ebc76aeea24389e8494b95fd3fbdc446dd62d441 (diff) | |
| parent | 74580d00921ce7cc6f8baf70b15903f5cf707b78 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.h
tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
tests/auto/quick/qquicktextedit/qquicktextedit.pro
tests/auto/quick/qquicktextinput/qquicktextinput.pro
Change-Id: I95d2c20a8619e5b8fa361c941a16dd8dce3e04e7
Diffstat (limited to 'qtdeclarative.pro')
| -rw-r--r-- | qtdeclarative.pro | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/qtdeclarative.pro b/qtdeclarative.pro index 9ecfad6f75..0e746c3c65 100644 --- a/qtdeclarative.pro +++ b/qtdeclarative.pro @@ -1,3 +1,10 @@ CONFIG += tests_need_tools examples_need_tools load(qt_parts) +!python_available { + py_out = $$system('python -c "print(1)"') + !equals(py_out, 1): error("Building QtQml requires Python version 2.") + tmp = python_available + CONFIG += $$tmp + cache(CONFIG, add, tmp) +} |