From f6a63df969e3b8c866519f391bb91101c0f26f3b Mon Sep 17 00:00:00 2001
From: EndrII <EndrIIMail@gmail.com>
Date: Wed, 2 Nov 2022 10:17:07 +0300
Subject: [PATCH 1/2] fix deploy output
---
md/en/Changelog.md | 14 +++++++++++++-
src/CQtDeployer/CMakeLists.txt | 22 +++++++++++-----------
2 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/md/en/Changelog.md b/md/en/Changelog.md
index bfbafeb..cab0783 100755
--- a/md/en/Changelog.md
+++ b/md/en/Changelog.md
@@ -1,6 +1,18 @@
# Change log
-## CQtDeployer 1.6
+## CQtDeployer v1.6.2265
+
+### What's Changed
+
+* Added sources into documentation by @EndrII in https://github.com/QuasarApp/CQtDeployer/pull/727
+* Added article for building cqtdeployer on arm platforms by @EndrII in https://github.com/QuasarApp/CQtDeployer/pull/726
+* Update zip submodule by @EndrII in https://github.com/QuasarApp/CQtDeployer/pull/730
+* Added the qml files dialogs test by @EndrII in https://github.com/QuasarApp/CQtDeployer/pull/729
+* Added the dynamic detection qt version and qt platform properties by @EndrII in https://github.com/QuasarApp/CQtDeployer/pull/733
+* Fix warning: ``run qmake file! execve: Permission denied`` by @EndrII in https://github.com/QuasarApp/CQtDeployer/pull/732
+
+
+## CQtDeployer 1.6.2227
### New features
diff --git a/src/CQtDeployer/CMakeLists.txt b/src/CQtDeployer/CMakeLists.txt
index ea5fa71..5a17b8f 100644
--- a/src/CQtDeployer/CMakeLists.txt
+++ b/src/CQtDeployer/CMakeLists.txt
@@ -70,6 +70,17 @@ set(LANGS ${CMAKE_CURRENT_SOURCE_DIR}/languages/en.ts
prepareQM(${CURRENT_PROJECT} ${CMAKE_CURRENT_SOURCE_DIR}/../ "${LANGS}")
+# sets qifw variable
+set(ApplicationsDir "@HomeDir@")
+set(QIFW_PLATFORM linux)
+set(INSTALLER_SUFIX ".run")
+if (WIN32)
+ set(QIFW_PLATFORM windows)
+ set(INSTALLER_SUFIX exe)
+ set(ApplicationsDir "@ApplicationsDir@")
+
+endif()
+
configure_file_in(${CURRENT_PROJECT} "${CMAKE_CURRENT_SOURCE_DIR}/Deploy/CQtDeployer.json")
configure_file_in(${CURRENT_PROJECT} "${CMAKE_CURRENT_SOURCE_DIR}/Deploy/CQtDeployerSingle.json")
@@ -84,17 +95,6 @@ add_custom_target(${name}Templates ALL
SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/Deploy/snapcraft.yaml.in"
)
-# sets qifw variable
-set(ApplicationsDir "@HomeDir@")
-set(QIFW_PLATFORM linux)
-set(INSTALLER_SUFIX .run)
-if (WIN32)
- set(QIFW_PLATFORM windows)
- set(INSTALLER_SUFIX exe)
- set(ApplicationsDir "@ApplicationsDir@")
-
-endif()
-
configure_file_in(${CURRENT_PROJECT} "${CMAKE_CURRENT_SOURCE_DIR}/Deploy/QIFWTemplate/config/config.xml")
From d8f6693fb14d3219c7a3e215bd882a244e1f1467 Mon Sep 17 00:00:00 2001
From: EndrII <EndrIIMail@gmail.com>
Date: Wed, 2 Nov 2022 10:41:59 +0300
Subject: [PATCH 2/2] fix windows output
---
src/CQtDeployer/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/CQtDeployer/CMakeLists.txt b/src/CQtDeployer/CMakeLists.txt
index 5a17b8f..109738e 100644
--- a/src/CQtDeployer/CMakeLists.txt
+++ b/src/CQtDeployer/CMakeLists.txt
@@ -76,7 +76,7 @@ set(QIFW_PLATFORM linux)
set(INSTALLER_SUFIX ".run")
if (WIN32)
set(QIFW_PLATFORM windows)
- set(INSTALLER_SUFIX exe)
+ set(INSTALLER_SUFIX ".exe")
set(ApplicationsDir "@ApplicationsDir@")
endif()