From fe5a989b5c972e83a3545ba2aaac07bd2de539aa Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Sat, 29 Dec 2012 11:57:40 +1100 Subject: Change Q_WS_WIN to Q_OS_WIN for Qt 5 compatibility Q_WS_WIN has been removed in Qt 5 so use Q_OS_WIN instead which exists in both Qt 4 and Qt 5 where appropriate. Change-Id: Icc9328f8d28da244dc828e670e2d6402c86a419b Reviewed-by: Friedemann Kleint --- qtsingleapplication/src/qtlockedfile.h | 2 +- qtsingleapplication/src/qtsingleapplication.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'qtsingleapplication') diff --git a/qtsingleapplication/src/qtlockedfile.h b/qtsingleapplication/src/qtlockedfile.h index 9c4b9e2..f956302 100644 --- a/qtsingleapplication/src/qtlockedfile.h +++ b/qtsingleapplication/src/qtlockedfile.h @@ -46,7 +46,7 @@ #include #endif -#if defined(Q_WS_WIN) +#if defined(Q_OS_WIN) # if !defined(QT_QTLOCKEDFILE_EXPORT) && !defined(QT_QTLOCKEDFILE_IMPORT) # define QT_QTLOCKEDFILE_EXPORT # elif defined(QT_QTLOCKEDFILE_IMPORT) diff --git a/qtsingleapplication/src/qtsingleapplication.h b/qtsingleapplication/src/qtsingleapplication.h index 9ae0543..f22a135 100644 --- a/qtsingleapplication/src/qtsingleapplication.h +++ b/qtsingleapplication/src/qtsingleapplication.h @@ -45,7 +45,7 @@ class QtLocalPeer; -#if defined(Q_WS_WIN) +#if defined(Q_OS_WIN) # if !defined(QT_QTSINGLEAPPLICATION_EXPORT) && !defined(QT_QTSINGLEAPPLICATION_IMPORT) # define QT_QTSINGLEAPPLICATION_EXPORT # elif defined(QT_QTSINGLEAPPLICATION_IMPORT) -- cgit v1.2.3