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

Conflicts: core/core.pro
2016-01-20 21:22:34 +01:00
parent 6f78308d7d bfbfb20700
commit 01c03be78c
22 changed files with 702 additions and 22 deletions
@@ -39,7 +39,10 @@ SOURCES += \
    permissionservice.cpp \
    filterui.cpp \
    exprevaluator.cpp \
-    samestringvalidator.cpp
+    samestringvalidator.cpp \
+    savefilterdialog.cpp \
+    filterdialog.cpp \
+    itablemodel.cpp

 HEADERS += core.h\
        core_global.h \
@@ -75,7 +78,10 @@ HEADERS += core.h\
    permissionservice.h \
    filterui.h \
    exprevaluator.h \
-    samestringvalidator.h
+    samestringvalidator.h \
+    savefilterdialog.h \
+    filterdialog.h \
+    itablemodel.h

 unix {
    target.path = /usr/lib
@@ -105,7 +111,9 @@ FORMS += \
    users/userform.ui \
    columndialog.ui \
    roles/rolesform.ui \
-    filterui.ui
+    filterui.ui \
+    savefilterdialog.ui \
+    filterdialog.ui

 OTHER_FILES += \
    users/metaData.json \