From 35190b82a82ca6856558bc7b5eb74a86b1b2d550 Mon Sep 17 00:00:00 2001 From: Josef Rokos Date: Fri, 17 Mar 2017 12:20:47 +0100 Subject: [PATCH] Link to EetCpp is now configurable. --- shop/shop.pro | 18 ++++++++++++++++-- shop/shopservice.cpp | 10 ++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/shop/shop.pro b/shop/shop.pro index 9551c44..f6e9f90 100644 --- a/shop/shop.pro +++ b/shop/shop.pro @@ -9,7 +9,9 @@ QT += widgets sql TARGET = shop TEMPLATE = lib -DEFINES += SHOP_LIBRARY\ +#CONFIG += eet + +DEFINES += SHOP_LIBRARY SOURCES += shop.cpp \ data/voucher.cpp \ @@ -90,7 +92,19 @@ DEPENDPATH += $$PWD/../addressbook TRANSLATIONS = translations/shop_cs_CZ.ts -unix|win32: LIBS += -L$$PWD/../../build-EetCpp-Desktop-Debug/libEet -lEetCpp +win32 { + LIBS += -lwinspool +} + +eet { + CONFIG(debug, debug|release) { + LIBS += -L$$PWD/../../EetCpp/bin/debug -lEetCpp + } else { + LIBS += -L$$PWD/../../EetCpp/bin/release -lEetCpp + } + + DEFINES += EET +} INCLUDEPATH += $$PWD/../../EetCpp/libEet DEPENDPATH += $$PWD/../../EetCpp/libEet diff --git a/shop/shopservice.cpp b/shop/shopservice.cpp index c07425a..53b4730 100644 --- a/shop/shopservice.cpp +++ b/shop/shopservice.cpp @@ -128,6 +128,7 @@ void ShopService::updateRelatedItem(VoucherItem* item, int countAdded) bool ShopService::processEet(VoucherPtr voucher, QString &message) { +#ifdef EET if (voucher->eetStatus() == Voucher::EET_NOT_ENTERING) { return true; @@ -205,16 +206,25 @@ bool ShopService::processEet(VoucherPtr voucher, QString &message) } return voucher->eetStatus() == Voucher::EET_SENT; +#else + return true; +#endif } void ShopService::setEetOnline(bool online) { +#ifdef EET EetSender::m_online = online; +#endif } bool ShopService::isEetOnline() { +#ifdef EET return EetSender::m_online; +#else + return false; +#endif } bool ShopService::isEetEnabled()