Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • src/3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp

    rc90b437dd8 r356169a3d3  
    4848#include "ui_qttoolbardialog.h"
    4949#include <QtCore/QSet>
    50 #include <QtGui/QAction>
    51 #include <QtGui/QToolBar>
    52 #include <QtGui/QMainWindow>
     50#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
     51#   include <QtGui/QAction>
     52#   include <QtGui/QToolBar>
     53#   include <QtGui/QMainWindow>
     54#   include <QtGui/QHeaderView>
     55#   include <QtGui/QPushButton>
     56#else
     57#   include <QtWidgets/QAction>
     58#   include <QtWidgets/QToolBar>
     59#   include <QtWidgets/QMainWindow>
     60#   include <QtWidgets/QHeaderView>
     61#   include <QtWidgets/QPushButton>
     62#endif
    5363#include <QtGui/QShowEvent>
    5464#include <QtGui/QHideEvent>
    55 #include <QtGui/QHeaderView>
    56 #include <QtGui/QPushButton>
    5765
    5866#ifndef GET_ICON
    59 #   if QT_VERSION >= 0x040600
     67#   if QT_VERSION >= QT_VERSION_CHECK(4,6,0)
    6068#       define GET_ICON(x) QIcon::fromTheme(x, QIcon(":/images/icons/128x128/"x".png"))
    6169#   else
  • src/3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.h

    rc90b437dd8 r356169a3d3  
    4848#define QTTOOLBARDIALOG_H
    4949
    50 #include <QtGui/QDialog>
     50#include <QtCore>
     51
     52#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
     53#   include <QtGui/QDialog>
     54#else
     55#   include <QtWidgets/QDialog>
     56#endif
    5157
    5258#if defined(Q_WS_WIN)
Note: See TracChangeset for help on using the changeset viewer.