Changeset 356169a3d3 in tspsg for src/3rdparty/qttoolbardialog-2.2_1-opensource

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.

Location:

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

Files:

• qttoolbardialog.cpp (modified) (1 diff)
• qttoolbardialog.h (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)