creyD/intelliphoto
1
0
Fork 0
mirror of https://github.com/creyD/intelliphoto.git synced 2026-04-13 20:00:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Helper_Variablen' into 'dev-stupidrenderer'

Browse Source 
# Conflicts:
#   src/Image/IntelliImage.h
#   src/IntelliPhoto.pro
#   src/Layer/PaintingArea.h
This commit is contained in:
Bastian Schindler
2020-01-08 23:47:37 +00:00
parent 7ed8e858af 540e23aadf
commit 9af9969c2f
38 changed files with 1311 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/IntelliPhoto.pro
View File

@@ -21,8 +21,12 @@ SOURCES += \
Image/IntelliRasterImage.cpp \
Image/IntelliShapedImage.cpp \
IntelliHelper/IntelliColorPicker.cpp \
IntelliHelper/IntelliHelper.cpp \
<<<<<<< src/IntelliPhoto.pro
IntelliHelper/IntelliRenderSettings.cpp \
=======
IntelliHelper/IntelliToolsettings.cpp \
IntelliHelper/IntelliTriangulation.cpp \
>>>>>>> src/IntelliPhoto.pro
Layer/PaintingArea.cpp \
Tool/IntelliTool.cpp \
Tool/IntelliToolCircle.cpp \
@@ -40,8 +44,13 @@ HEADERS += \
Image/IntelliRasterImage.h \
Image/IntelliShapedImage.h \
IntelliHelper/IntelliColorPicker.h \
<<<<<<< src/IntelliPhoto.pro
IntelliHelper/IntelliHelper.h \
IntelliHelper/IntelliRenderSettings.h \
=======
IntelliHelper/IntelliToolsettings.h \
IntelliHelper/IntelliTriangulation.h \
>>>>>>> src/IntelliPhoto.pro
Layer/PaintingArea.h \
Tool/IntelliTool.h \
Tool/IntelliToolCircle.h \
@@ -65,3 +74,6 @@ ICON = icon.icns
qnx: target.path = /tmp/$${TARGET}/bin
else: unix:!android: target.path = /opt/$${TARGET}/bin
!isEmpty(target.path): INSTALLS += target
RESOURCES += \
Bilder.qrc