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

Build has been fixed

Browse Source
This commit is contained in:
Arin Alexander 2018-05-07 22:52:28 +03:00
parent ee9450697b
commit eacc5c645e
5 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common.pri
View File

@ -11,13 +11,20 @@ DEPENDPATH += $$PWD/3rdparty/easyprofiler/easy_profiler_core/include
contains(CONFIG, easy_profiler){ contains(CONFIG, easy_profiler){
message(EasyProfiler) message(EasyProfiler)
unix|win32: LIBS += -L$$PWD/3rdparty/easyprofiler/build/bin/ -leasy_profiler unix|win32: LIBS += -L$$PWD/3rdparty/easyprofiler/build/bin/ -leasy_profiler
DEFINES += BUILD_WITH_EASY_PROFILER greaterThan(QT_MAJOR_VERSION, 4){
DEFINES += BUILD_WITH_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_MINOR_VERSION, 6){
CONFIG *= qtscriptengine
}
}
lessThan(QT_MAJOR_VERSION, 5){ lessThan(QT_MAJOR_VERSION, 5){
CONFIG *= qtscriptengine CONFIG *= qtscriptengine
} }

6
demo_r1/mainwindow.cpp
View File

@ -38,7 +38,7 @@
#include <QDebug> #include <QDebug>
#include <QStringListModel> #include <QStringListModel>
#ifndef HAVE_QT4 #ifdef BUILD_WITH_EASY_PROFILER
#include "easy/profiler.h" #include "easy/profiler.h"
#else #else
# define EASY_BLOCK(...) # define EASY_BLOCK(...)
@ -127,7 +127,7 @@ void MainWindow::on_pushButton_clicked()
report->setShowProgressDialog(false); report->setShowProgressDialog(false);
report->designReport(); report->designReport();
EASY_END_BLOCK; EASY_END_BLOCK;
#ifndef HAVE_QT4 #ifdef BUILD_WITH_EASY_PROFILER
profiler::dumpBlocksToFile("test.prof"); profiler::dumpBlocksToFile("test.prof");
#endif #endif
} }
@ -145,7 +145,7 @@ 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 #ifdef BUILD_WITH_EASY_PROFILER
profiler::dumpBlocksToFile("test.prof"); profiler::dumpBlocksToFile("test.prof");
#endif #endif
report->previewReport(); report->previewReport();

2
limereport/lrdatasourcemanager.cpp
View File

@ -37,7 +37,7 @@
#include <QFileInfo> #include <QFileInfo>
#include <stdexcept> #include <stdexcept>
#ifndef HAVE_QT4 #ifdef BUILD_WITH_EASY_PROFILER
#include "easy/profiler.h" #include "easy/profiler.h"
#else #else
# define EASY_BLOCK(...) # define EASY_BLOCK(...)

2
limereport/lrreportengine.cpp
View File

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

3
limereport/serializators/lrxmlreader.cpp
View File

@ -36,7 +36,8 @@
#include "lrreporttranslation.h" #include "lrreporttranslation.h"
#include <QDebug> #include <QDebug>
#ifndef HAVE_QT4
#ifdef BUILD_WITH_EASY_PROFILER
#include "easy/profiler.h" #include "easy/profiler.h"
#else #else
# define EASY_BLOCK(...) # define EASY_BLOCK(...)