Devel #56

Merged
0xFEEDC0DE64 merged 84 commits from devel into master 2017-12-29 13:34:28 +01:00
154 changed files with 3302 additions and 2431 deletions
Showing only changes of commit 4e16a15994 - Show all commits

View File

@@ -15,12 +15,12 @@ DEPENDPATH += $$PWD/../../zeiterfassungcorelib $$PWD/../../zeiterfassungguilib
DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT
HEADERS += devtoolsplugin.h \
logmodel.h \
logdialog.h
logdialog.h \
logmodel.h
SOURCES += devtoolsplugin.cpp \
logmodel.cpp \
logdialog.cpp
logdialog.cpp \
logmodel.cpp
FORMS += logdialog.ui

View File

@@ -14,13 +14,13 @@ DEPENDPATH += $$PWD/../../zeiterfassungcorelib $$PWD/../../zeiterfassungguilib
DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT
HEADERS += lunchmealplugin.h \
lunchmealwidget.h \
lunchmealdialog.h
HEADERS += lunchmealdialog.h \
lunchmealplugin.h \
lunchmealwidget.h
SOURCES += lunchmealplugin.cpp \
lunchmealwidget.cpp \
lunchmealdialog.cpp
SOURCES += lunchmealdialog.cpp \
lunchmealplugin.cpp \
lunchmealwidget.cpp
FORMS += lunchmealdialog.ui