fergalmoran/flameshot
1
0
Fork 0
mirror of https://github.com/fergalmoran/flameshot.git synced 2026-01-03 07:34:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'flameshot-org-master' into bugfix/memory-leak

Browse Source 
# Conflicts:
#	.github/workflows/Linux-pack.yml
#	CMakeLists.txt
#	data/graphics.qrc
#	src/config/configwindow.cpp
#	src/tools/imgur/imguruploader.cpp
This commit is contained in:
Yuriy Puchkov
2020-10-11 20:49:15 +03:00
parent a472648263 ac7142c4df
commit c92f8e3014
26 changed files with 153 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/widgets/infowindow.cpp
View File

@@ -36,7 +36,7 @@ InfoWindow::InfoWindow(QWidget* parent)
: QWidget(parent)
{
setAttribute(Qt::WA_DeleteOnClose);
setWindowIcon(QIcon(":img/app/flameshot.svg"));
setWindowIcon(QIcon(":img/app/org.flameshot.Flameshot.svg"));
setWindowTitle(tr("About"));
#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))