Actually Usable Version #7

Merged
andrewlalis merged 7 commits from development into master 2018-03-29 14:11:27 +00:00
3 changed files with 6 additions and 4 deletions
Showing only changes of commit aab7a10553 - Show all commits

View File

@ -14,7 +14,6 @@ TEMPLATE = app
SOURCES += model/recipe/instruction.cpp \ SOURCES += model/recipe/instruction.cpp \
model/recipe/recipe.cpp \ model/recipe/recipe.cpp \
userInterface/mainwindow.cpp \
main.cpp \ main.cpp \
model/database/database.cpp \ model/database/database.cpp \
model/recipe/ingredients/unitofmeasure.cpp \ model/recipe/ingredients/unitofmeasure.cpp \
@ -34,7 +33,8 @@ SOURCES += model/recipe/instruction.cpp \
utils/aspectratiopixmaplabel.cpp \ utils/aspectratiopixmaplabel.cpp \
utils/stringutils.cpp \ utils/stringutils.cpp \
gui/openrecipedialog.cpp \ gui/openrecipedialog.cpp \
model/recipe/recipetablemodel.cpp model/recipe/recipetablemodel.cpp \
gui/mainwindow.cpp
HEADERS += model/recipe/instruction.h \ HEADERS += model/recipe/instruction.h \
model/recipe/recipe.h \ model/recipe/recipe.h \
@ -58,7 +58,8 @@ HEADERS += model/recipe/instruction.h \
utils/aspectratiopixmaplabel.h \ utils/aspectratiopixmaplabel.h \
utils/stringutils.h \ utils/stringutils.h \
gui/openrecipedialog.h \ gui/openrecipedialog.h \
model/recipe/recipetablemodel.h model/recipe/recipetablemodel.h \
gui/mainwindow.h
LIBS += -ldl \ LIBS += -ldl \
@ -67,7 +68,8 @@ FORMS += gui/mainwindow.ui \
gui/newDialogs/newingredientdialog.ui \ gui/newDialogs/newingredientdialog.ui \
gui/newDialogs/newtagdialog.ui \ gui/newDialogs/newtagdialog.ui \
gui/newDialogs/newunitdialog.ui \ gui/newDialogs/newunitdialog.ui \
gui/openrecipedialog.ui gui/openrecipedialog.ui \
gui/mainwindow.ui
DISTFILES += \ DISTFILES += \
.gitignore .gitignore