diff options
| author | Jonathan Liu <net147@gmail.com> | 2012-12-29 11:57:40 +1100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2012-12-29 20:21:07 +0100 |
| commit | fe5a989b5c972e83a3545ba2aaac07bd2de539aa (patch) | |
| tree | 80f7f13c7245a62d0b85cffc76885a83bdc4e448 /qtwinmigrate | |
| parent | 18c20da49bc4432e50ead5595402b3ec8c9026a7 (diff) | |
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 <Friedemann.Kleint@digia.com>
Diffstat (limited to 'qtwinmigrate')
| -rw-r--r-- | qtwinmigrate/src/qmfcapp.h | 2 | ||||
| -rw-r--r-- | qtwinmigrate/src/qwinhost.h | 2 | ||||
| -rw-r--r-- | qtwinmigrate/src/qwinwidget.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/qtwinmigrate/src/qmfcapp.h b/qtwinmigrate/src/qmfcapp.h index cb2b022..dc002e2 100644 --- a/qtwinmigrate/src/qmfcapp.h +++ b/qtwinmigrate/src/qmfcapp.h @@ -51,7 +51,7 @@ class CWinApp; #endif -#if defined(Q_WS_WIN) +#if defined(Q_OS_WIN) # if !defined(QT_QTWINMIGRATE_EXPORT) && !defined(QT_QTWINMIGRATE_IMPORT) # define QT_QTWINMIGRATE_EXPORT # elif defined(QT_QTWINMIGRATE_IMPORT) diff --git a/qtwinmigrate/src/qwinhost.h b/qtwinmigrate/src/qwinhost.h index 1c55984..0d5e8a6 100644 --- a/qtwinmigrate/src/qwinhost.h +++ b/qtwinmigrate/src/qwinhost.h @@ -46,7 +46,7 @@ #include <QWidget> -#if defined(Q_WS_WIN) +#if defined(Q_OS_WIN) # if !defined(QT_QTWINMIGRATE_EXPORT) && !defined(QT_QTWINMIGRATE_IMPORT) # define QT_QTWINMIGRATE_EXPORT # elif defined(QT_QTWINMIGRATE_IMPORT) diff --git a/qtwinmigrate/src/qwinwidget.h b/qtwinmigrate/src/qwinwidget.h index 1ece708..b7db2c9 100644 --- a/qtwinmigrate/src/qwinwidget.h +++ b/qtwinmigrate/src/qwinwidget.h @@ -49,7 +49,7 @@ class CWnd; -#if defined(Q_WS_WIN) +#if defined(Q_OS_WIN) # if !defined(QT_QTWINMIGRATE_EXPORT) && !defined(QT_QTWINMIGRATE_IMPORT) # define QT_QTWINMIGRATE_EXPORT # elif defined(QT_QTWINMIGRATE_IMPORT) |