mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-25 00:54:39 +03:00
Code

Qt4 build fixed

Browse Source
This commit is contained in:
Arin Alexander 2017-10-26 13:12:07 +04:00
commit 7ba2b1d5b3
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
limereport/lrreportdesignwidget.cpp
View File

@ -58,7 +58,12 @@ ReportDesignWidget::ReportDesignWidget(ReportEngine *report, QMainWindow *mainWi
#endif #endif
m_mainWindow(mainWindow), m_verticalGridStep(10), m_horizontalGridStep(10), m_useGrid(false), m_dialogChanged(false) m_mainWindow(mainWindow), m_verticalGridStep(10), m_horizontalGridStep(10), m_useGrid(false), m_dialogChanged(false)
{ {
#ifdef HAVE_QT5
m_tabWidget = new QTabWidget(this); m_tabWidget = new QTabWidget(this);
#endif
#ifdef HAVE_QT4
m_tabWidget = new LimeReportTabWidget(this);
#endif
m_tabWidget->setTabPosition(QTabWidget::South); m_tabWidget->setTabPosition(QTabWidget::South);
m_tabWidget->setMovable(true); m_tabWidget->setMovable(true);
connect(m_tabWidget->tabBar(), SIGNAL(tabMoved(int,int)), this, SLOT(slotTabMoved(int,int))); connect(m_tabWidget->tabBar(), SIGNAL(tabMoved(int,int)), this, SLOT(slotTabMoved(int,int)));

14
limereport/lrreportdesignwidget.h
View File

@ -42,6 +42,15 @@
#include "lrreportengine_p.h" #include "lrreportengine_p.h"
#include "lrgraphicsviewzoom.h" #include "lrgraphicsviewzoom.h"
#ifdef HAVE_QT4
QT_BEGIN_NAMESPACE
class LimeReportTabWidget: public QTabWidget{
public:
explicit LimeReportTabWidget(QWidget *parent = 0):QTabWidget(parent){}
QTabBar* tabBar() const{ return QTabWidget::tabBar();}
};
QT_END_NAMESPACE
#endif
namespace LimeReport { namespace LimeReport {
@ -198,7 +207,12 @@ private:
DialogDesignerManager* m_dialogDesignerManager; DialogDesignerManager* m_dialogDesignerManager;
#endif #endif
QMainWindow *m_mainWindow; QMainWindow *m_mainWindow;
#ifdef HAVE_QT5
QTabWidget* m_tabWidget; QTabWidget* m_tabWidget;
#endif
#ifdef HAVE_QT4
LimeReportTabWidget* m_tabWidget;
#endif
GraphicsViewZoomer* m_zoomer; GraphicsViewZoomer* m_zoomer;
QFont m_defaultFont; QFont m_defaultFont;
int m_verticalGridStep; int m_verticalGridStep;