Changeset 89e5214692 in tspsg for src/globals.h

Timestamp:

Sep 12, 2012, 6:50:04 PM (12 years ago)

Author:

Oleksii Serdiuk

Branches:

appveyor, imgbot, master, readme

Children:

197f54a2b9

Parents:

f48433245d

Message:

Replaced all Q_WS_xxx with Q_OS_xxx ifdefs where possible.

This is needed for compatibility with Qt 5.

File:

• src/globals.h (modified) (2 diffs)

src/globals.h

@@ -34 +34 @@
 #   error You are using Qt version < 4.5 but minimum required version is 4.5.0. Compilation aborted.
 #endif
-#if defined(Q_WS_WINCE_WM) || defined(Q_WS_S60) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
+#if defined(Q_OS_WINCE_WM) || defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
     //! This is defined on handheld devices (e.g., Windows Mobile, Symbian).
 #   define HANDHELD
@@ -131 +131 @@
 inline bool hasUpdater()
 {
-#ifdef Q_WS_WIN32
+#ifdef Q_OS_WIN32
     return QFile::exists("updater/Update.exe");
-#else // Q_WS_WIN32
+#else // Q_OS_WIN32
     return false;
-#endif // Q_WS_WIN32
+#endif // Q_OS_WIN32
 }