AppVeyor: Build against Qt 5.7

mapeditor · Aug 15, 2016 · 642f40a · 642f40a
1 parent 2465cdc
commit 642f40a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -4,10 +4,10 @@ os: Previous Visual Studio 2013
 
 environment:
   global:
-    MINGW: C:\Qt\Tools\mingw492_32
+    MINGW: C:\Qt\Tools\mingw530_32
   matrix:
-    - QTDIR: C:\Qt\5.6\mingw49_32
-    - QTDIR: C:\Qt\5.6\msvc2013_64
+    - QTDIR: C:\Qt\5.7\mingw53_32
+    - QTDIR: C:\Qt\5.7\msvc2013_64
 
 configuration: Release
 

diff --git a/dist/distribute.qbs b/dist/distribute.qbs
@@ -78,9 +78,11 @@ Product {
             ];
 
             if (qbs.targetOS.contains("windows")) {
-                list.push("icuin54.dll",
-                          "icuuc54.dll",
-                          "icudt54.dll");
+                if (Qt.core.versionMinor < 7) {
+                    list.push("icuin54.dll",
+                              "icuuc54.dll",
+                              "icudt54.dll");
+                }
             } else if (qbs.targetOS.contains("linux")) {
                 list = addQtVersions(list);
                 list = list.concat(addQtVersions([

diff --git a/dist/win/installer.wxs b/dist/win/installer.wxs
@@ -89,9 +89,6 @@
             <File Id="Qt5Network_dll" Source="$(var.QtDir)\bin\Qt5Network.dll"/>
             <File Id="Qt5Widgets_dll" Source="$(var.QtDir)\bin\Qt5Widgets.dll"/>
             <File Id="Qt5OpenGL_dll" Source="$(var.QtDir)\bin\Qt5OpenGL.dll"/>
-            <File Id="icuin54_dll" Source="$(var.QtDir)\bin\icuin54.dll"/>
-            <File Id="icuuc54_dll" Source="$(var.QtDir)\bin\icuuc54.dll"/>
-            <File Id="icudt54_dll" Source="$(var.QtDir)\bin\icudt54.dll"/>
 
             <?ifdef MingwDir ?>
             <File Id="libgcc_s_dw2_1_dll" Source="$(var.MingwDir)\bin\libgcc_s_dw2-1.dll"/>