Merge branch 'master' of https://git.bukova.info/repos/git/prodejna

shop/shop.pro

@@ -29,7 +29,8 @@ SOURCES += shop.cpp \
     shopitem.cpp \
     isellableservice.cpp \
     data/favorititem.cpp \
-    settings/favoriteservice.cpp
+    settings/favoriteservice.cpp \
+    eetbatchdialog.cpp
 
 HEADERS += shop.h\
         shop_global.h \
@@ -52,7 +53,8 @@ HEADERS += shop.h\
     paydvouchersdialog.h \
     shopitem.h \
     data/favorititem.h \
-    settings/favoriteservice.h
+    settings/favoriteservice.h \
+    eetbatchdialog.h
 
 include(../config_plugin.pri)
 
@@ -74,7 +76,8 @@ FORMS += \
     receiptloadform.ui \
     settings/shopsettingsform.ui \
     paydialog.ui \
-    paydvouchersdialog.ui
+    paydvouchersdialog.ui \
+    eetbatchdialog.ui
 
 win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../plugins/ -laddressbook
 else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../plugins/ -laddressbook
@@ -86,3 +89,8 @@ INCLUDEPATH += $$PWD/
 DEPENDPATH += $$PWD/../addressbook
 
 TRANSLATIONS = translations/shop_cs_CZ.ts
+
+unix|win32: LIBS += -L$$PWD/../../build-EetCpp-Desktop-Debug/libEet -lEetCpp
+
+INCLUDEPATH += $$PWD/../../EetCpp/libEet
+DEPENDPATH += $$PWD/../../EetCpp/libEet