diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-09-16 15:17:21 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-09-16 15:17:21 +0200 |
| commit | 914adeab82d228773def64c9c304d1e15bab0b52 (patch) | |
| tree | 9ab0f8e7b09d62b77ffc5450d9e883a89d69fd88 /tests/system/README | |
| parent | 11f89ece8de7763f811d2fe1e45cb27ad4a77519 (diff) | |
| parent | a4db6db358aefb60bac34cacbab23aa6f38279f7 (diff) | |
| download | qt-creator-914adeab82d228773def64c9c304d1e15bab0b52.tar.gz | |
Merge remote-tracking branch 'origin/3.2'
Conflicts:
src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp
src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
Change-Id: I1627f6aa98a442413f8b08b579ecaf9647dc887b
Diffstat (limited to 'tests/system/README')
| -rw-r--r-- | tests/system/README | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/system/README b/tests/system/README index d09f3239fd..9f0b951a1c 100644 --- a/tests/system/README +++ b/tests/system/README @@ -28,6 +28,8 @@ Fifth - you'll have to make sure that some needed tools are available (no matter * wget or curl, capable of HTTPS Normally it should be okay to just install them as usual and add their executables' path(s) to the PATH variable. +Sixth - Qt Creator should be built with ClangCodeModel plugin. +How to do so, see QTCREATOR_REPO/src/plugins/clangcodemodel/README. Attention! If any of these prerequisites cannot be satisfied the tests will likely fail (or not run at all). |