Merge with develop

--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2016-05-16 18:20:14 +02:00
commit addbfd7553

View file

@ -111,7 +111,7 @@ bool Set7zFileAttrib(const QString &filename, uint32 fileAttributes)
// qDebug() << "attribs" << QByteArray::fromRawData((const char*)&fileAttributes, 4).toHex();
#ifdef Q_OS_WIN1
#ifdef Q_OS_WIN
SetFileAttributesW((wchar_t*)filename.utf16(), windowsAttributes);
#else
const char *name = filename.toUtf8().constData();