From 00e99132c7a10657b0b98be55d959e9ae4e55440 Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Mon, 16 May 2016 18:20:14 +0200
Subject: [PATCH] Merge with develop

---
 code/ryzom/tools/client/ryzom_installer/src/filesextractor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/ryzom/tools/client/ryzom_installer/src/filesextractor.cpp b/code/ryzom/tools/client/ryzom_installer/src/filesextractor.cpp
index 3686bec30..87b3d4896 100644
--- 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();