diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-01-11 09:29:37 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-01-11 09:29:37 +0100 |
| commit | b1f1ccb32ec31a1c4598e9fd22b23c1548a73299 (patch) | |
| tree | ca92d55857a1552cd926ca858b351a905608ed34 /README.md | |
| parent | fa84524c0c9b93210e4151cf772375696d0080c6 (diff) | |
| parent | a8230eb6c1a45489f33ffa86498e5ea3452496e1 (diff) | |
| download | qt-creator-b1f1ccb32ec31a1c4598e9fd22b23c1548a73299.tar.gz | |
Merge remote-tracking branch 'origin/4.2'
Conflicts:
src/plugins/android/androidbuildapkstep.cpp
src/plugins/genericprojectmanager/genericproject.cpp
Change-Id: I3484b668f9323ed0c05de99f8dfed07c9e65ab98
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -261,7 +261,7 @@ http://llvm.org/docs/GettingStarted.html#git-mirror: For Linux/macOS: - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=<installation location> -DLLVM_ENABLE_RTTI=ON ..\llvm + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=<installation location> -DLLVM_ENABLE_RTTI=ON ../llvm make install For Windows: |