build: Updated to Qt 5.10.1 and Clang/llvm 6.0

* updated docker scripts and yml file
This commit is contained in:
Andreas Stallinger
2018-04-06 16:08:00 +02:00
parent 0c3f830c31
commit 20106d5ce1
5 changed files with 19 additions and 19 deletions
+4 -4
View File
@@ -5,7 +5,7 @@
#### External Software
* JDK 1.8
* QT 5.9.1
* QT 5.10.1
* CxxTest 4.3
* Clang & LLVM 6.0 (doesnt quite work for windows, use unix setup below and skip all the ninja stuff)(installation guide http://clang.llvm.org/docs/LibASTMatchersTutorial.html)
* Boost 1.64
@@ -24,11 +24,11 @@
* BOTAN_DIR - .../Botan-2.1.0
For MacOS and Linux
* QT_DIR - .../Qt/Qt5.9.1/5.9.1/<IDE>
* QT_DIR - .../Qt/Qt5.10.1/5.10.1/<IDE>
For Windows:
* QT_WIN32_DIR - .../Qt/Qt5.9.1/5.9.1/msvc2015
* QT_WIN64_DIR - .../Qt/Qt5.9.1/5.9.1/msvc2015_64
* QT_WIN32_DIR - .../Qt/Qt5.10.1/5.10.1/msvc2015
* QT_WIN64_DIR - .../Qt/Qt5.10.1/5.10.1/msvc2015_64
* VLD_DIR - .../Visual Leak Detector
* JAVA_HOME - .../Java/jdk1.x.x_xxx
* path