Changeset 141 in tspsg-svn for trunk/src/globals.h

Timestamp:

Oct 3, 2010, 2:01:00 PM (14 years ago)

Author:

laleppa

Message:

+ Added support for Simulator from Nokia Qt SDK

• Made some Maemo related tweaks
• Removed ids for unsupported OSs from os.h (i.e., MSDOS, OS/2)

File:

• trunk/src/globals.h (modified) (4 diffs)

trunk/src/globals.h

@@ -42 +42 @@
 #endif // NOSVG
 
-#if defined(Q_OS_WINCE_WM) || defined(Q_OS_SYMBIAN)
+#if defined(Q_WS_WINCE_WM) || defined(Q_WS_S60) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
         //! This is defined on handheld devices (e.g., Windows Mobile, Symbian).
         #define HANDHELD
@@ -59 +59 @@
 // TSPSolver
 #include "tspsolver.h"
-#ifdef Q_OS_WIN32
+#ifdef Q_WS_WIN32
         // Vista/7 Eyecandy
         #include "qtwin.h"
-#endif // Q_OS_WIN32
+#endif // Q_WS_WIN32
 
 // DEFINES
@@ -122 +122 @@
 inline bool hasUpdater()
 {
-#ifdef Q_OS_WIN32
+#ifdef Q_WS_WIN32
         return QFile::exists("updater/Update.exe");
-#else // Q_OS_WIN32
+#else // Q_WS_WIN32
         return false;
-#endif // Q_OS_WIN32
+#endif // Q_WS_WIN32
 }
 
-#ifdef Q_OS_WIN32
+#ifdef Q_WS_WIN32
 /*!
  * \brief Enables or disables a mask for the \a widget.
@@ -138 +138 @@
  */
 void toggleStyle(QWidget *widget, bool enable);
-#endif // Q_OS_WIN32
+#endif // Q_WS_WIN32
 
 #ifndef DOXYGEN_EXCLUDE