Shift to master. Not done but database abstraction is nearly done. #3

Merged
andrewlalis merged 10 commits from development into master 2018-03-03 09:20:11 +00:00
1 changed files with 9 additions and 7 deletions
Showing only changes of commit 7f0fd90e73 - Show all commits

View File

@ -12,8 +12,7 @@ TARGET = RecipeDB
TEMPLATE = app TEMPLATE = app
SOURCES += SQLite/sqlite3.c \ SOURCES += model/recipe/instruction.cpp \
model/recipe/instruction.cpp \
model/recipe/recipe.cpp \ model/recipe/recipe.cpp \
userInterface/mainwindow.cpp \ userInterface/mainwindow.cpp \
main.cpp \ main.cpp \
@ -22,11 +21,10 @@ SOURCES += SQLite/sqlite3.c \
model/recipe/ingredients/ingredient.cpp \ model/recipe/ingredients/ingredient.cpp \
model/recipe/ingredients/ingredientlistmodel.cpp \ model/recipe/ingredients/ingredientlistmodel.cpp \
model/recipe/ingredients/recipeingredient.cpp \ model/recipe/ingredients/recipeingredient.cpp \
model/recipe/tags/recipetag.cpp model/recipe/tags/recipetag.cpp \
SQLite/sqlite3.c
HEADERS += SQLite/sqlite3.h \ HEADERS += model/recipe/instruction.h \
SQLite/sqlite3ext.h \
model/recipe/instruction.h \
model/recipe/recipe.h \ model/recipe/recipe.h \
userInterface/mainwindow.h \ userInterface/mainwindow.h \
model/database/database.h \ model/database/database.h \
@ -34,7 +32,11 @@ HEADERS += SQLite/sqlite3.h \
model/recipe/ingredients/ingredient.h \ model/recipe/ingredients/ingredient.h \
model/recipe/ingredients/ingredientlistmodel.h \ model/recipe/ingredients/ingredientlistmodel.h \
model/recipe/ingredients/recipeingredient.h \ model/recipe/ingredients/recipeingredient.h \
model/recipe/tags/recipetag.h model/recipe/tags/recipetag.h \
SQLite/sqlite3.h \
SQLite/sqlite3ext.h
LIBS += -ldl \
FORMS += gui/mainwindow.ui FORMS += gui/mainwindow.ui