From 41e0c88b05ff78abcb275ed32b4b074931d26721 Mon Sep 17 00:00:00 2001
From: EndrII <EndrIIMail@gmail.com>
Date: Wed, 29 Sep 2021 11:09:05 +0300
Subject: [PATCH] fix windows icons
---
Deploy/Deploy.pro | 2 +-
Deploy/Distributions/idistribution.cpp | 2 +-
QIFData/config/configLinux.xml | 2 +-
QIFData/config/configWin.xml | 2 +-
QIFData/installerCQtDeployer.pri | 4 ++--
QIFData/packages/cqtdeployer.1_5/meta/package.xml | 2 +-
snap/gui/cqtdeployer.desktop | 4 ++--
snap/snapcraft.yaml | 2 +-
8 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Deploy/Deploy.pro b/Deploy/Deploy.pro
index dc6d61d..890b394 100644
--- a/Deploy/Deploy.pro
+++ b/Deploy/Deploy.pro
@@ -19,7 +19,7 @@ TEMPLATE = lib
DEFINES += DEPLOY_LIBRARY
-VERSION = 1.5.4.6
+VERSION = 1.5.4.7
DEFINES += APP_VERSION='\\"$$VERSION\\"'
diff --git a/Deploy/Distributions/idistribution.cpp b/Deploy/Distributions/idistribution.cpp
index f11cf6b..33b6377 100644
--- a/Deploy/Distributions/idistribution.cpp
+++ b/Deploy/Distributions/idistribution.cpp
@@ -295,7 +295,7 @@ bool iDistribution::deployIcon(const DistroModule& pkg) {
QuasarAppUtils::Params::log(QString("%0: %1").arg(target, icon),
QuasarAppUtils::Debug);
- if (!targetObject.fEnableRunScript()) {
+ if (!targetObject.getShortCut()) {
QuasarAppUtils::Params::log(QString("%0: %1 Ignored").arg(target, icon),
QuasarAppUtils::Debug);
continue;
diff --git a/QIFData/config/configLinux.xml b/QIFData/config/configLinux.xml
index cefafd5..2d24511 100644
--- a/QIFData/config/configLinux.xml
+++ b/QIFData/config/configLinux.xml
@@ -3,7 +3,7 @@
<WizardDefaultWidth>640px</WizardDefaultWidth>
<WizardDefaultHeight>400px</WizardDefaultHeight>
<Name>CQtDeployer</Name>
- <Version>1.5.4.6</Version>
+ <Version>1.5.4.7</Version>
<Title>CQtDeployer</Title>
<Publisher>QuasarApp</Publisher>
<StartMenuDir>CQtDeployer</StartMenuDir>
diff --git a/QIFData/config/configWin.xml b/QIFData/config/configWin.xml
index a7b0d95..307cbe7 100644
--- a/QIFData/config/configWin.xml
+++ b/QIFData/config/configWin.xml
@@ -3,7 +3,7 @@
<WizardDefaultWidth>640px</WizardDefaultWidth>
<WizardDefaultHeight>400px</WizardDefaultHeight>
<Name>CQtDeployer</Name>
- <Version>1.5.4.6</Version>
+ <Version>1.5.4.7</Version>
<Title>CQtDeployer</Title>
<Publisher>QuasarApp</Publisher>
<StartMenuDir>CQtDeployer</StartMenuDir>
diff --git a/QIFData/installerCQtDeployer.pri b/QIFData/installerCQtDeployer.pri
index 5a90392..a98dd48 100644
--- a/QIFData/installerCQtDeployer.pri
+++ b/QIFData/installerCQtDeployer.pri
@@ -1,4 +1,4 @@
-VERSION = 1.5.4.6
+VERSION = 1.5.4.7
include($$PWD/InstallerBase.pri);
@@ -23,7 +23,7 @@ BASE_DEPLOY_FLAGS_CQT = $$BASE_DEPLOY_FLAGS -targetDir $$DATA_DIR $$OUT_LIB $$OU
win32:CQT_ICON = -icon $$PWD/config/icon.ico
unix:CQT_ICON = -icon $$PWD/config/logo.png
-BASE_DEPLOY_FLAGS_DEB = $$BASE_DEPLOY_FLAGS -targetDir $$PWD/../Distro $$OUT_LIB $$OUT_BIN deb zip -name CQtDeployer -publisher QuasarApp $$CQT_ICON -deployVersion 1.5.4.6 -debOut CQtDeployer_'$$VERSION'_Linux64.deb -zipOut CQtDeployer_'$$VERSION'_Linux64.zip
+BASE_DEPLOY_FLAGS_DEB = $$BASE_DEPLOY_FLAGS -targetDir $$PWD/../Distro $$OUT_LIB $$OUT_BIN deb zip -name CQtDeployer -publisher QuasarApp $$CQT_ICON -deployVersion 1.5.4.7 -debOut CQtDeployer_'$$VERSION'_Linux64.deb -zipOut CQtDeployer_'$$VERSION'_Linux64.zip
DEPLOY_TARGET_DEB = $$DEPLOY_TARGET,$$PWD/packages/QIF/data/QIF
deploy_dep.commands += $$DEPLOYER -bin $$DEPLOY_TARGET $$BASE_DEPLOY_FLAGS_CQT
diff --git a/QIFData/packages/cqtdeployer.1_5/meta/package.xml b/QIFData/packages/cqtdeployer.1_5/meta/package.xml
index 2b3f72a..c1dc1f3 100644
--- a/QIFData/packages/cqtdeployer.1_5/meta/package.xml
+++ b/QIFData/packages/cqtdeployer.1_5/meta/package.xml
@@ -2,7 +2,7 @@
<Package>
<DisplayName>CQtDeployer 1.5</DisplayName>
<Description>CQtDeployer 1.5</Description>
- <Version>1.5.4.6</Version>
+ <Version>1.5.4.7</Version>
<Default>true</Default>
<ForcedInstallation>false</ForcedInstallation>
<Script>installscript.js</Script>
diff --git a/snap/gui/cqtdeployer.desktop b/snap/gui/cqtdeployer.desktop
index c00546d..eff7f08 100755
--- a/snap/gui/cqtdeployer.desktop
+++ b/snap/gui/cqtdeployer.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Version=1.5.4.6
+Version=1.5.4.7
Name=CQtDeployer
Comment=CQtDeployer Help.
Exec=cqtdeployer
@@ -10,6 +10,6 @@ Categories=Application;
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=CQtDeployer
X-GNOME-Bugzilla-Component=General
-X-GNOME-Bugzilla-Version=1.5.4.6
+X-GNOME-Bugzilla-Version=1.5.4.7
StartupNotify=true
Name[ru_RU]=CQtDeployer
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index e4a6ba5..df6526b 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -6,7 +6,7 @@
#
name: cqtdeployer # you probably want to 'snapcraft register <name>'
-version: '1.5.4.6' # just for humans, typically '1.2+git' or '1.3.2'
+version: '1.5.4.7' # just for humans, typically '1.2+git' or '1.3.2'
summary: deploy your qt projects # 79 char long summary
description: |
Console app for deploy qt libs.