Fixed build on linux

This commit is contained in:
2017-03-28 21:02:38 +02:00
parent 31beac537b
commit 7aa00f1b1e
2 changed files with 24 additions and 1 deletions
+22
View File
@@ -37,8 +37,30 @@ FORMS += mainwindow.ui \
logindialog.ui
unix{
ARCH_TYPE = unix
macx{
ARCH_TYPE = macx
}
linux{
!contains(QT_ARCH, x86_64){
ARCH_TYPE = linux32
}else{
ARCH_TYPE = linux64
}
}
}
unix {
QMAKE_CXXFLAGS += -Wno-unknown-pragmas
CONFIG(debug, debug|release) {
LIBS += -L$$PWD/../../LimeReport/build/$${QT_VERSION}/$${ARCH_TYPE}/debug/lib/ -llimereport -lQtZint
#QMAKE_CXXFLAGS += -Wl,-rpath-link,$$PWD/../../LimeReport/build/$${QT_VERSION}/$${ARCH_TYPE}/debug/lib/
} else {
LIBS += -L$$PWD/../../LimeReport/build/$${QT_VERSION}/$${ARCH_TYPE}/release/lib/ -llimereport -lQtZint
#QMAKE_CXXFLAGS += -Wl,-rpath-link,$$PWD/../../LimeReport/build/$${QT_VERSION}/$${ARCH_TYPE}/release/lib/
}
}
win32 {
+2 -1
View File
@@ -28,7 +28,8 @@ void ReportViewer::setReport(ReportPtr report)
QFile file(reportPath);
file.open(QFile::ReadOnly);
m_report->loadFromByteArray(&file.readAll());
QByteArray data = file.readAll();
m_report->loadFromByteArray(&data);
m_report->setReportFileName(reportPath);
m_report->dataManager()->setReportVariable("dbPath", Context::instance().settings()->value("db/path", "").toString());
}