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

Qt4 build fixed

Browse Source
This commit is contained in:
Arin Alexander 2019-11-20 14:59:01 +03:00
parent 53c018a5c7
commit f95db14cad
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
limereport/limereport.pri
View File

@ -1,8 +1,11 @@
include(../common.pri) include(../common.pri)
contains(CONFIG, qtxlsx){
DEFINES += HAVE_QTXLSX greaterThan(QT_MAJOR_VERSION, 4) {
include($$PWD/../3rdparty/qtxlsx/src/xlsx/qtxlsx.pri) contains(CONFIG, qtxlsx){
DEFINES += HAVE_QTXLSX
include($$PWD/../3rdparty/qtxlsx/src/xlsx/qtxlsx.pri)
}
} }
contains(CONFIG, embedded_designer){ contains(CONFIG, embedded_designer){
@ -74,7 +77,6 @@ SOURCES += \
$$REPORT_PATH/items/lrchartitemeditor.cpp \ $$REPORT_PATH/items/lrchartitemeditor.cpp \
$$REPORT_PATH/lrreporttranslation.cpp \ $$REPORT_PATH/lrreporttranslation.cpp \
$$REPORT_PATH/exporters/lrpdfexporter.cpp \ $$REPORT_PATH/exporters/lrpdfexporter.cpp \
$$REPORT_PATH/exporters/lrhtmlexporter.cpp \
$$REPORT_PATH/lrpreparedpages.cpp $$REPORT_PATH/lrpreparedpages.cpp
contains(CONFIG, staticlib){ contains(CONFIG, staticlib){
@ -85,9 +87,12 @@ contains(CONFIG, zint){
SOURCES += $$REPORT_PATH/items/lrbarcodeitem.cpp SOURCES += $$REPORT_PATH/items/lrbarcodeitem.cpp
} }
contains(CONFIG, qtxlsx){ greaterThan(QT_MAJOR_VERSION, 4) {
message(QtXLSX) SOURCES += $$REPORT_PATH/exporters/lrhtmlexporter.cpp
SOURCES += $$REPORT_PATH/exporters/lrexcelexporter.cpp contains(CONFIG, qtxlsx){
message(QtXLSX)
SOURCES += $$REPORT_PATH/exporters/lrexcelexporter.cpp
}
} }
HEADERS += \ HEADERS += \
@ -164,7 +169,6 @@ HEADERS += \
$$REPORT_PATH/lrexporterintf.h \ $$REPORT_PATH/lrexporterintf.h \
$$REPORT_PATH/lrexportersfactory.h \ $$REPORT_PATH/lrexportersfactory.h \
$$REPORT_PATH/exporters/lrpdfexporter.h \ $$REPORT_PATH/exporters/lrpdfexporter.h \
$$REPORT_PATH/exporters/lrhtmlexporter.h \
$$REPORT_PATH/lrpreparedpages.h \ $$REPORT_PATH/lrpreparedpages.h \
$$REPORT_PATH/lrpreparedpagesintf.h $$REPORT_PATH/lrpreparedpagesintf.h
@ -176,8 +180,11 @@ contains(CONFIG,zint){
HEADERS += $$REPORT_PATH/items/lrbarcodeitem.h HEADERS += $$REPORT_PATH/items/lrbarcodeitem.h
} }
contains(CONFIG, qtxlsx){ greaterThan(QT_MAJOR_VERSION, 4) {
HEADERS += $$REPORT_PATH/exporters/lrexcelexporter.h HEADERS += $$REPORT_PATH/exporters/lrhtmlexporter.h
contains(CONFIG, qtxlsx){
HEADERS += $$REPORT_PATH/exporters/lrexcelexporter.h
}
} }
FORMS += \ FORMS += \

6
limereport/lrsimplecrypt.cpp
View File

@ -67,13 +67,15 @@ namespace LimeReport {
class ChipperPrivate{ class ChipperPrivate{
friend class Chipper; friend class Chipper;
public: public:
ChipperPrivate():m_prepared(false){} ChipperPrivate():m_prepared(false) {
memset(S, 0, sizeof (S));
}
bool isPrepared(){ return m_prepared;} bool isPrepared(){ return m_prepared;}
private: private:
void RC5_SETUP(const char *K); void RC5_SETUP(const char *K);
void RC5_ENCRYPT(WORD *pt, WORD *ct); void RC5_ENCRYPT(WORD *pt, WORD *ct);
void RC5_DECRYPT(WORD *ct, WORD *pt); void RC5_DECRYPT(WORD *ct, WORD *pt);
WORD S[26] = {0}; WORD S[26];
bool m_prepared; bool m_prepared;
}; };