QuasarApp/CQtDeployer
4
1
Fork 0
mirror of https://github.com/QuasarApp/CQtDeployer.git synced 2025-05-02 04:29:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request from QuasarApp/fixOutputs

Browse Source 
Fix deploy output
This commit is contained in:
Andrei Yankovich 2022-11-02 11:31:51 +03:00 committed by GitHub
commit 24847be7dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 12 deletions
md/en
Changelog.md
src/CQtDeployer
CMakeLists.txt

14
md/en/Changelog.md

@ -1,6 +1,18 @@
# Change log # 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 ### New features

22
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}") 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/CQtDeployer.json")
configure_file_in(${CURRENT_PROJECT} "${CMAKE_CURRENT_SOURCE_DIR}/Deploy/CQtDeployerSingle.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" 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") configure_file_in(${CURRENT_PROJECT} "${CMAKE_CURRENT_SOURCE_DIR}/Deploy/QIFWTemplate/config/config.xml")