Changeset 356169a3d3 in tspsg for src/globals.h

Timestamp:

Jul 11, 2012, 6:46:48 PM (12 years ago)

Author:

Oleksii Serdiuk

Branches:

appveyor, imgbot, master, readme

Children:

ff8d0488a0

Parents:

c90b437dd8

Message:

Updated code to become compilable with Qt 5.

Compiling with Qt 4 is still possible and it will be the main platform
for TSPSG releases until first Qt 5 release is made.

File:

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

src/globals.h

@@ -31 +31 @@
 // INCLUDES
 #include <QtCore>
-#if QT_VERSION < 0x040500
+#if QT_VERSION < QT_VERSION_CHECK(4,5,0)
 #   error You are using Qt version < 4.5 but minimum required version is 4.5.0. Compilation aborted.
 #endif
@@ -46 +46 @@
 #   include <QtSvg>
 #endif // NOSVG
+#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+#   include <QtConcurrent>
+#   include <QtPrintSupport>
+#endif
 
 #ifndef HANDHELD
@@ -160 +164 @@
 #endif
 
-#if QT_VERSION >= 0x040600
+#if QT_VERSION >= QT_VERSION_CHECK(4,6,0)
 #   define GET_ICON(x) QIcon::fromTheme(x, QIcon(":/images/icons/"ICON_SIZE"/"x"."ICON_FORMAT))
 #else