Merge with develop

--HG-- branch : compatibility-develop
9 years ago · addbfd7553
parent 47d1d7a111 1fc5934bfa
commit addbfd7553
1 changed files with 1 additions and 1 deletions
--- a/code/ryzom/tools/client/ryzom_installer/src/filesextractor.cpp
+++ b/code/ryzom/tools/client/ryzom_installer/src/filesextractor.cpp
@ -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();