Changeset 356169a3d3 in tspsg for src/main.cpp

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/main.cpp (modified) (2 diffs)

src/main.cpp

@@ -23 +23 @@
 
 #include "mainwindow.h"
-#if QT_VERSION < 0x040600
+#if QT_VERSION < QT_VERSION_CHECK(4,6,0)
 #   ifdef Q_CC_MSVC
 #       pragma message("WARNING: You are using Qt version < 4.6. Application will not support some non-critical features.")
@@ -49 +49 @@
     app.setOverrideCursor(QCursor(Qt::WaitCursor));
     QTextCodec::setCodecForLocale(QTextCodec::codecForName("utf8"));
+#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
     QTextCodec::setCodecForCStrings(QTextCodec::codecForName("utf8"));
     QTextCodec::setCodecForTr(QTextCodec::codecForName("utf8"));
+#endif
     app.setOrganizationName("Oleksii Serdiuk");
     app.setOrganizationDomain("oleksii.name");