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

Timestamp:

Sep 6, 2010, 10:23:38 PM (14 years ago)

Author:

laleppa

Message:

• The minimum required version of Qt is now 4.5.0.
• Updated source code to be compatible with the minimum required version of Qt.
• Updated documentation to reflect these changes.

File:

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

trunk/src/globals.h

@@ -31 +31 @@
 // INCLUDES
 #include <QtCore>
+#if QT_VERSION < 0x040500
+        #error You are using Qt version < 4.5 but minimum required version is 4.5.0. Compilation aborted.
+#endif
+#ifdef QT_NO_SVG
+        #define NOSVG
+#endif
 #include <QtGui>
-#if !defined(NOSVG) && (QT_VERSION >= 0x040500)
+#if !defined(NOSVG)
         #include <QtSvg>
-#endif // NOSVG && QT_VERSION >= 0x040500
+#endif // NOSVG
 
 #if defined(Q_OS_WINCE_WM) || defined(Q_OS_SYMBIAN)
@@ -119 +125 @@
 #endif // Q_OS_WIN32
 
+#if QT_VERSION >= 0x040600
+        #define GET_ICON(x) QIcon::fromTheme(x, QIcon(":/images/icons/"x".png"))
+#else
+        #define GET_ICON(x) QIcon(":/images/icons/"x".png")
+#endif
+
 // Sanity checks
 // Check that default number of cities is sane (<= MAX_NUM_CITIES)