Merge pull request #913 from Jojo-Schmitz/Qt-5.3

change Windows build to use Qt-5.3
musescore · May 20, 2014 · 3e5b91d · 3e5b91d
2 parents d26a8df + b414f30
commit 3e5b91d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/build/mingw32.mingw.cmake b/build/mingw32.mingw.cmake
@@ -4,8 +4,8 @@
 
 set (CMAKE_SYSTEM_NAME "Windows")
 
-set (CROSS C:/Qt/Tools/mingw48_32)
-set (CROSSQT C:/Qt/5.2.1/mingw48_32)
+set (CROSS C:/Qt/Tools/mingw482_32)
+set (CROSSQT C:/Qt/5.3/mingw482_32)
 
 set (CMAKE_C_COMPILER     ${CROSS}/bin/gcc.exe)
 set (CMAKE_CXX_COMPILER   ${CROSS}/bin/g++.exe)

diff --git a/mscore/CMakeLists.txt b/mscore/CMakeLists.txt
@@ -410,9 +410,9 @@ if (MINGW)
       ${CROSSQT}/bin/Qt5Sensors.dll
       ${CROSSQT}/bin/Qt5Multimedia.dll
       ${CROSSQT}/bin/Qt5MultimediaWidgets.dll
-      ${CROSSQT}/bin/icuin51.dll
-      ${CROSSQT}/bin/icuuc51.dll
-      ${CROSSQT}/bin/icudt51.dll
+      ${CROSSQT}/bin/icuin52.dll
+      ${CROSSQT}/bin/icuuc52.dll
+      ${CROSSQT}/bin/icudt52.dll
       DESTINATION bin)
 
     install(FILES