diff --git a/appveyor.yml b/appveyor.yml index 0b34860caa..abcc60725b 100644 --- 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 index c5e17d32bf..4f9c5f6648 100644 --- 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 index b3e933577e..9665a89c31 100644 --- a/dist/win/installer.wxs +++ b/dist/win/installer.wxs @@ -89,9 +89,6 @@ - - -