Changeset 356169a3d3 in tspsg

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.

Files:

• src/3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp (modified) (1 diff)
• src/3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.h (modified) (1 diff)
• src/globals.h (modified) (3 diffs)
• src/main.cpp (modified) (2 diffs)
• src/mainwindow.cpp (modified) (6 diffs)
• src/settingsdialog.cpp (modified) (1 diff)
• tspsg.pro (modified) (1 diff)

src/3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp

@@ -48 +48 @@
 #include "ui_qttoolbardialog.h"
 #include <QtCore/QSet>
-#include <QtGui/QAction>
-#include <QtGui/QToolBar>
-#include <QtGui/QMainWindow>
+#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
+#   include <QtGui/QAction>
+#   include <QtGui/QToolBar>
+#   include <QtGui/QMainWindow>
+#   include <QtGui/QHeaderView>
+#   include <QtGui/QPushButton>
+#else
+#   include <QtWidgets/QAction>
+#   include <QtWidgets/QToolBar>
+#   include <QtWidgets/QMainWindow>
+#   include <QtWidgets/QHeaderView>
+#   include <QtWidgets/QPushButton>
+#endif
 #include <QtGui/QShowEvent>
 #include <QtGui/QHideEvent>
-#include <QtGui/QHeaderView>
-#include <QtGui/QPushButton>
 
 #ifndef GET_ICON
-#   if QT_VERSION >= 0x040600
+#   if QT_VERSION >= QT_VERSION_CHECK(4,6,0)
 #       define GET_ICON(x) QIcon::fromTheme(x, QIcon(":/images/icons/128x128/"x".png"))
 #   else

src/3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.h

@@ -48 +48 @@
 #define QTTOOLBARDIALOG_H
 
-#include <QtGui/QDialog>
+#include <QtCore>
+
+#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
+#   include <QtGui/QDialog>
+#else
+#   include <QtWidgets/QDialog>
+#endif
 
 #if defined(Q_WS_WIN)

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

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");

src/mainwindow.cpp

@@ -1304 +1304 @@
 QColor hilight;
     if (color.value() < 192)
-        hilight.setHsv(color.hue(), color.saturation(), 127 + qRound(color.value() / 2));
+        hilight.setHsv(color.hue(), color.saturation(), 127 + (color.value() / 2));
     else
         hilight.setHsv(color.hue(), color.saturation(), color.value() / 2);
@@ -1362 +1362 @@
         a->setStatusTip(language.at(3));
 #endif
-#if QT_VERSION >= 0x040600
+#if QT_VERSION >= QT_VERSION_CHECK(4,6,0)
         a->setIcon(QIcon::fromTheme(QString("flag-%1").arg(language.at(1)), QIcon(QString(":/images/icons/l10n/flag-%1.png").arg(language.at(1)))));
 #else
@@ -1682 +1682 @@
 #ifndef HANDHELD
     menuSettingsLanguage->setIcon(GET_ICON("preferences-desktop-locale"));
-#if QT_VERSION >= 0x040600
+#if QT_VERSION >= QT_VERSION_CHECK(4,6,0)
     actionSettingsLanguageEnglish->setIcon(QIcon::fromTheme("flag-gb", QIcon(":/images/icons/l10n/flag-gb.png")));
-#else // QT_VERSION >= 0x040600
+#else
     actionSettingsLanguageEnglish->setIcon(QIcon(":/images/icons/l10n/flag-gb.png"));
-#endif // QT_VERSION >= 0x040600
+#endif // QT_VERSION >= QT_VERSION_CHECK(4,6,0)
     menuSettingsStyle->setIcon(GET_ICON("preferences-desktop-theme"));
 #endif // HANDHELD
@@ -1697 +1697 @@
     actionHelpReportBug->setIcon(GET_ICON("tools-report-bug"));
     actionHelpAbout->setIcon(GET_ICON("help-about"));
+#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
     actionHelpAboutQt->setIcon(QIcon(":/trolltech/qmessagebox/images/qtlogo-64.png"));
-#endif
+#else
+    actionHelpAboutQt->setIcon(QIcon(":/qt-project.org/qmessagebox/images/qtlogo-64.png"));
+#endif // QT_VERSION < QT_VERSION_CHECK(5,0,0)
+#endif // HANDHELD
     // Buttons
     buttonRandom->setIcon(GET_ICON("roll"));
@@ -1707 +1711 @@
 //      action->setIcon(GET_ICON(""));
 
-#if QT_VERSION >= 0x040600
+#if QT_VERSION >= QT_VERSION_CHECK(4,6,0)
     setToolButtonStyle(Qt::ToolButtonFollowStyle);
 #endif
@@ -1756 +1760 @@
     actionFilePageSetup->setObjectName("actionFilePrintSetup");
 //    actionFilePageSetup->setEnabled(false);
-#if QT_VERSION >= 0x040600
+#if QT_VERSION >= QT_VERSION_CHECK(4,6,0)
     actionFilePageSetup->setIcon(QIcon::fromTheme("document-page-setup", QIcon(":/trolltech/dialogs/qprintpreviewdialog/images/page-setup-32.png")));
 #else

src/settingsdialog.cpp

@@ -258 +258 @@
 #endif
 
-#if !defined(NOSVG) && (QT_VERSION >= 0x040500)
+#if !defined(NOSVG) && (QT_VERSION >= QT_VERSION_CHECK(4,5,0))
     comboGraphImageFormat->addItem("svg");
-#endif // NOSVG && QT_VERSION >= 0x040500
+#endif
     // We create whitelist of formats, supported by the most popular web browsers according to
     //  http://en.wikipedia.org/wiki/Comparison_of_web_browsers#Image_format_support

tspsg.pro

@@ -15 +15 @@
 } else {
     DEFINES += NOSVG
+}
+
+greaterThan(QT_MAJOR_VERSION, 4) {
+    QT += printsupport concurrent
 }