Change includes in Spreadsheet to be compatible with Qt5.
This change is Qt4/Qt5 neutral.
This commit is contained in:
parent
0aa944a1b7
commit
db345cb624
|
@ -22,7 +22,12 @@
|
|||
#include "Workbench.h"
|
||||
#include "ViewProviderSpreadsheet.h"
|
||||
#include "SpreadsheetView.h"
|
||||
|
||||
#if QT_VERSION >= 0x050000
|
||||
#include "qrc_Spreadsheet.cpp"
|
||||
#else
|
||||
#include "qrc_Spreadsheet.cxx"
|
||||
#endif
|
||||
|
||||
// use a different name to CreateCommand()
|
||||
void CreateSpreadsheetCommands(void);
|
||||
|
|
|
@ -44,20 +44,20 @@
|
|||
**
|
||||
****************************************************************************/
|
||||
|
||||
#include <QtGui/QApplication>
|
||||
#include <QtGui/QDesktopWidget>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QtGui/QPushButton>
|
||||
#include <QtGui/QColorDialog>
|
||||
#include <QApplication>
|
||||
#include <QDesktopWidget>
|
||||
#include <QPainter>
|
||||
#include <QPushButton>
|
||||
#include <QColorDialog>
|
||||
#include <QtCore/QMap>
|
||||
#include <QtGui/QLayout>
|
||||
#include <QtGui/QStyle>
|
||||
#include <QtGui/QLabel>
|
||||
#include <QtGui/QToolTip>
|
||||
#include <QLayout>
|
||||
#include <QStyle>
|
||||
#include <QLabel>
|
||||
#include <QToolTip>
|
||||
#include <QtGui/QPixmap>
|
||||
#include <QtGui/QFocusEvent>
|
||||
#include <QtGui/QPaintEvent>
|
||||
#include <QtGui/QGridLayout>
|
||||
#include <QGridLayout>
|
||||
#include <QtGui/QHideEvent>
|
||||
#include <QtGui/QKeyEvent>
|
||||
#include <QtGui/QShowEvent>
|
||||
|
|
|
@ -46,11 +46,11 @@
|
|||
|
||||
#ifndef QTCOLORPICKER_H
|
||||
#define QTCOLORPICKER_H
|
||||
#include <QtGui/QPushButton>
|
||||
#include <QPushButton>
|
||||
#include <QtCore/QString>
|
||||
#include <QtGui/QColor>
|
||||
|
||||
#include <QtGui/QLabel>
|
||||
#include <QLabel>
|
||||
#include <QtCore/QEvent>
|
||||
#include <QtGui/QFocusEvent>
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user