mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-24 08:34:38 +03:00
Code

Build has been fixed

Browse Source
This commit is contained in:
Arin Alexander 2018-03-22 23:00:51 +03:00
parent a072e84173
commit fbbf6af33d
6 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common.pri
View File

@ -16,9 +16,10 @@ contains(CONFIG, easy_profiler){
!contains(CONFIG, qtscriptengine){ !contains(CONFIG, qtscriptengine){
greaterThan(QT_MAJOR_VERSION, 4){ greaterThan(QT_MAJOR_VERSION, 4){
greaterThan(QT_MINOR_VERSION, 5){
CONFIG *= qjsengine CONFIG *= qjsengine
} }
lessThan(QT_MAJOR_VERSION, 5){
CONFIG *= qtscriptengine
} }
} }

10
demo_r1/mainwindow.cpp
View File

@ -38,7 +38,13 @@
#include <QDebug> #include <QDebug>
#include <QStringListModel> #include <QStringListModel>
#ifndef HAVE_QT4
#include "easy/profiler.h" #include "easy/profiler.h"
#else
# define EASY_BLOCK(...)
# define EASY_END_BLOCK
# define EASY_PROFILER_ENABLE
#endif
MainWindow::MainWindow(QWidget *parent) : MainWindow::MainWindow(QWidget *parent) :
QMainWindow(parent), QMainWindow(parent),
@ -121,7 +127,9 @@ void MainWindow::on_pushButton_clicked()
report->setShowProgressDialog(false); report->setShowProgressDialog(false);
report->designReport(); report->designReport();
EASY_END_BLOCK; EASY_END_BLOCK;
#ifndef HAVE_QT4
profiler::dumpBlocksToFile("test.prof"); profiler::dumpBlocksToFile("test.prof");
#endif
} }
void MainWindow::on_pushButton_2_clicked() void MainWindow::on_pushButton_2_clicked()
@ -137,7 +145,9 @@ void MainWindow::on_pushButton_2_clicked()
report->dataManager()->setReportVariable(ui->leVariableName->text(), ui->leVariableValue->text()); report->dataManager()->setReportVariable(ui->leVariableName->text(), ui->leVariableValue->text());
} }
EASY_END_BLOCK; EASY_END_BLOCK;
#ifndef HAVE_QT4
profiler::dumpBlocksToFile("test.prof"); profiler::dumpBlocksToFile("test.prof");
#endif
report->previewReport(); report->previewReport();
} }
} }

5
limereport/lrdatasourcemanager.cpp
View File

@ -37,7 +37,12 @@
#include <QFileInfo> #include <QFileInfo>
#include <stdexcept> #include <stdexcept>
#ifndef HAVE_QT4
#include "easy/profiler.h" #include "easy/profiler.h"
#else
# define EASY_BLOCK(...)
# define EASY_END_BLOCK
#endif
namespace LimeReport{ namespace LimeReport{

5
limereport/lrreportengine.cpp
View File

@ -56,7 +56,12 @@
#include "lrpreviewreportwidget.h" #include "lrpreviewreportwidget.h"
#include "lrpreviewreportwidget_p.h" #include "lrpreviewreportwidget_p.h"
#ifndef HAVE_QT4
#include "easy/profiler.h" #include "easy/profiler.h"
#else
# define EASY_BLOCK(...)
# define EASY_END_BLOCK
#endif
#ifdef HAVE_STATIC_BUILD #ifdef HAVE_STATIC_BUILD

4
limereport/scripteditor/lrscripteditor.cpp
View File

@ -312,7 +312,11 @@ QStringList ReportStructureCompleater::extractSlotNames(BaseDesignIntf *item)
for(int i = mo->methodOffset(); i < mo->methodCount(); ++i) for(int i = mo->methodOffset(); i < mo->methodCount(); ++i)
{ {
if (mo->method(i).methodType() == QMetaMethod::Signal) { if (mo->method(i).methodType() == QMetaMethod::Signal) {
#ifndef HAVE_QT4
result.append(QString::fromLatin1(mo->method(i).name())); result.append(QString::fromLatin1(mo->method(i).name()));
#else
result.append(QString::fromLatin1(mo->method(i).signature()));
#endif
} }
} }
mo = mo->superClass(); mo = mo->superClass();

5
limereport/serializators/lrxmlreader.cpp
View File

@ -36,7 +36,12 @@
#include "lrreporttranslation.h" #include "lrreporttranslation.h"
#include <QDebug> #include <QDebug>
#ifndef HAVE_QT4
#include "easy/profiler.h" #include "easy/profiler.h"
#else
# define EASY_BLOCK(...)
# define EASY_END_BLOCK
#endif
namespace LimeReport{ namespace LimeReport{