summaryrefslogtreecommitdiffstats
path: root/qtlockedfile
diff options
context:
space:
mode:
authorJonathan Liu <net147@gmail.com>2012-12-29 12:18:09 +1100
committerFriedemann Kleint <Friedemann.Kleint@digia.com>2012-12-29 20:21:19 +0100
commit70855469ce1fe82e1bba6b88d32a97081a70d7d1 (patch)
treee8acd58272a13084415d9d14e93ce633aa33df7e /qtlockedfile
parentfe5a989b5c972e83a3545ba2aaac07bd2de539aa (diff)
Define QT_WA if using Qt 5
Qt 5 always uses Unicode so define QT_WA to always select the Unicode path if using Qt 5. Change-Id: Ib0f0f403180442278728201c64cc79c284e2cb93 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'qtlockedfile')
-rw-r--r--qtlockedfile/src/qtlockedfile_win.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/qtlockedfile/src/qtlockedfile_win.cpp b/qtlockedfile/src/qtlockedfile_win.cpp
index d9bcd44..e9c9904 100644
--- a/qtlockedfile/src/qtlockedfile_win.cpp
+++ b/qtlockedfile/src/qtlockedfile_win.cpp
@@ -42,6 +42,10 @@
#include <qt_windows.h>
#include <QFileInfo>
+#if QT_VERSION >= 0x050000
+#define QT_WA(unicode, ansi) unicode
+#endif
+
#define MUTEX_PREFIX "QtLockedFile mutex "
// Maximum number of concurrent read locks. Must not be greater than MAXIMUM_WAIT_OBJECTS
#define MAX_READERS MAXIMUM_WAIT_OBJECTS