mirror of
				https://github.com/fralx/LimeReport.git
				synced 2025-10-31 05:11:56 +03:00 
			
		
		
		
	Build has been fixed
This commit is contained in:
		| @@ -16,9 +16,10 @@ contains(CONFIG, easy_profiler){ | ||||
|  | ||||
| !contains(CONFIG, qtscriptengine){ | ||||
| greaterThan(QT_MAJOR_VERSION, 4){ | ||||
| greaterThan(QT_MINOR_VERSION, 5){ | ||||
|     CONFIG *= qjsengine | ||||
| } | ||||
| lessThan(QT_MAJOR_VERSION, 5){ | ||||
|     CONFIG *= qtscriptengine | ||||
| } | ||||
| } | ||||
|  | ||||
|   | ||||
| @@ -38,7 +38,13 @@ | ||||
| #include <QDebug> | ||||
| #include <QStringListModel> | ||||
|  | ||||
| #ifndef HAVE_QT4 | ||||
| #include "easy/profiler.h" | ||||
| #else | ||||
| # define EASY_BLOCK(...) | ||||
| # define EASY_END_BLOCK | ||||
| # define EASY_PROFILER_ENABLE | ||||
| #endif | ||||
|  | ||||
| MainWindow::MainWindow(QWidget *parent) : | ||||
|     QMainWindow(parent), | ||||
| @@ -121,7 +127,9 @@ void MainWindow::on_pushButton_clicked() | ||||
|     report->setShowProgressDialog(false); | ||||
|     report->designReport(); | ||||
|     EASY_END_BLOCK; | ||||
| #ifndef HAVE_QT4 | ||||
|     profiler::dumpBlocksToFile("test.prof"); | ||||
| #endif | ||||
| } | ||||
|  | ||||
| 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()); | ||||
|         } | ||||
|         EASY_END_BLOCK; | ||||
| #ifndef HAVE_QT4 | ||||
|         profiler::dumpBlocksToFile("test.prof"); | ||||
| #endif | ||||
|         report->previewReport(); | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -37,7 +37,12 @@ | ||||
| #include <QFileInfo> | ||||
| #include <stdexcept> | ||||
|  | ||||
| #ifndef HAVE_QT4 | ||||
| #include "easy/profiler.h" | ||||
| #else | ||||
| # define EASY_BLOCK(...) | ||||
| # define EASY_END_BLOCK | ||||
| #endif | ||||
|  | ||||
| namespace LimeReport{ | ||||
|  | ||||
|   | ||||
| @@ -56,7 +56,12 @@ | ||||
| #include "lrpreviewreportwidget.h" | ||||
| #include "lrpreviewreportwidget_p.h" | ||||
|  | ||||
| #ifndef HAVE_QT4 | ||||
| #include "easy/profiler.h" | ||||
| #else | ||||
| # define EASY_BLOCK(...) | ||||
| # define EASY_END_BLOCK | ||||
| #endif | ||||
|  | ||||
|  | ||||
| #ifdef HAVE_STATIC_BUILD | ||||
|   | ||||
| @@ -312,7 +312,11 @@ QStringList ReportStructureCompleater::extractSlotNames(BaseDesignIntf *item) | ||||
|         for(int i = mo->methodOffset(); i < mo->methodCount(); ++i) | ||||
|         { | ||||
|             if (mo->method(i).methodType() == QMetaMethod::Signal) { | ||||
| #ifndef HAVE_QT4 | ||||
|                 result.append(QString::fromLatin1(mo->method(i).name())); | ||||
| #else | ||||
|                 result.append(QString::fromLatin1(mo->method(i).signature())); | ||||
| #endif | ||||
|             } | ||||
|         } | ||||
|         mo = mo->superClass(); | ||||
|   | ||||
| @@ -36,7 +36,12 @@ | ||||
| #include "lrreporttranslation.h" | ||||
|  | ||||
| #include <QDebug> | ||||
| #ifndef HAVE_QT4 | ||||
| #include "easy/profiler.h" | ||||
| #else | ||||
| # define EASY_BLOCK(...) | ||||
| # define EASY_END_BLOCK | ||||
| #endif | ||||
|  | ||||
| namespace LimeReport{ | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user