Merge branch 'dev' into dev-docs

This commit is contained in:
2019-12-19 12:43:22 +01:00
10 changed files with 545 additions and 349 deletions

View File

@@ -29,6 +29,7 @@ SOURCES += \
Tool/IntelliToolLine.cpp \
Tool/IntelliToolPen.cpp \
Tool/IntelliToolPlain.cpp \
Tool/IntelliToolPolygon.cpp \
Tool/IntelliToolRectangle.cpp \
main.cpp
@@ -46,11 +47,11 @@ HEADERS += \
Tool/IntelliToolLine.h \
Tool/IntelliToolPen.h \
Tool/IntelliToolPlain.h \
Tool/IntelliToolRectangle.h \
Tool/intellitoolcircle.h
Tool/IntelliToolPolygon.h \
Tool/IntelliToolRectangle.h
FORMS += \
widget.ui
mainwindow.ui
QMAKE_CXXFLAGS
QMAKE_LFLAGS