[Kst] branches/work/kst/portto4/kst/cmake

[Peter Kümmel]

SVN commit 1324136 by kuemmel:

update Qt5

 M  +2 -2      misc/CMakeLists.txt  
 M  +6 -1      travis.sh  


--- branches/work/kst/portto4/kst/cmake/misc/CMakeLists.txt #1324135:1324136
@@ -12,8 +12,8 @@
 			DESTINATION bin
 			CONFIGURATIONS Release)
 		install(FILES
-			${QT_BINARY_DIR}/../plugins/platforms/qminimal5.dll
-			${QT_BINARY_DIR}/../plugins/platforms/windows5.dll			
+			${QT_BINARY_DIR}/../plugins/platforms/qminimal.dll
+			${QT_BINARY_DIR}/../plugins/platforms/windows.dll			
 			DESTINATION bin/platforms
 			CONFIGURATIONS Release)
 	else()
--- branches/work/kst/portto4/kst/cmake/travis.sh #1324135:1324136
@@ -136,9 +136,14 @@
 mingw=i686-w64-mingw32
 if [ "$1" = "qt5" ]; then
     qtver=5.0.0
+    tarver=-3
     gccver=4.7.2
+    dw2=-dw2
+    extlib=
+    useext=
 else
     qtver=4.8.4
+    tarver=
     gccver=4.7.2
     dw2=-dw2
     extlib=kst-3rdparty-win32-gcc-dw2-4.7.2
@@ -177,7 +182,7 @@
 # download and install Qt
 #
 if [ ! -d /opt/$qtver ]; then
-    qttar=$qtver-Ubuntu32-12.04.tar
+    qttar=$qtver-Ubuntu32-12.04$tarver.tar
     wget https://github.com/downloads/syntheticpp/kst/$qttar.xz
     checkExitCode
     xz -d $qttar.xz