qbs: Update to 1.6.0

This commit is contained in:
Alexey Pavlov
2016-08-29 15:11:19 +03:00
parent 4e721c4442
commit a973e15a44
2 changed files with 5 additions and 5 deletions

View File

@@ -21,10 +21,10 @@ index 0ae9f6c..3d5e03c 100644
+ << QLatin1String("i686-pc-msys") << QLatin1String("x86_64-pc-msys");
}
static QStringList completeToolchainList(const QString &toolchainName)
static QStringList toolchainTypeFromCompilerName(const QString &compilerName)
@@ -191,7 +192,7 @@ static Profile createGccProfile(const QString &compilerFilePath, Settings *setti
{
const QString machineName = gccMachineName(compilerFilePath);
const QStringList compilerTriplet = machineName.split(QLatin1Char('-'));
- if (toolchainTypes.contains(QLatin1String("mingw"))) {
+ if (toolchainTypes.contains(QLatin1String("mingw")) || toolchainTypes.contains(QLatin1String("msys"))) {

View File

@@ -22,7 +22,7 @@
_realname=qbs
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=1.5.2
pkgver=1.6.0
pkgrel=1
_pkgfqn="${_realname}-src-${pkgver}"
pkgdesc="Qt Build Suite (mingw-w64)"
@@ -41,11 +41,11 @@ source=("http://download.qt-project.org/official_releases/qbs/${pkgver}/${_pkgfq
"0008-add-many-files-to-installed-headers.1.4.patch"
"0090-WIP-Xcode-generator.1.4.patch"
"0091-Disable-WIP-Xcode-generator.1.4.patch")
sha256sums=('059b4f64c1f599379a17bbf859dd9658fafe8cb2b65b31634974ff1c381928c1'
sha256sums=('ae850e957e4a811a193b02a067321722dd0e5fc50b7c370ec34273c1565e78ab'
'838098b25a8044176b3139b4003594570c62a8d64f5470fbbd769f3bf44e0855'
'18f1bfe2434ccf97e1366a96b83bdc41bbd4399185bb701d061710b292a5ad59'
'a6f3316cd4756ba60404ac17f0a60aa573b99c08501f3f423f4f71052e149ebc'
'1a9499215f4fc8fc9a530a984fe7248ad55720a383ceb0984ad7afb25abda7d6'
'1cd74c4dec1ecc996cdd783c33450633a100e82ab5a58169f65454668879b201'
'40d53fca4e80ab63baa8649bae43882daf2c91de22412c71dec712ac59f4a39e'
'f00efb4af427e4de5edb0c46196f0c6192294559c92a309eea6dfd81c0d302c3'
'576d7a6875fc20f4360edea765f8134493ad64a5941afbd92732e841e055b854'