From 5cd777a27b3710520dfe50063d32b9f26a09416b Mon Sep 17 00:00:00 2001
From: EndrII <EndrIIMail@gmail.com>
Date: Sat, 26 Jan 2019 09:03:29 +0300
Subject: [PATCH] win 1.1.1
---
CQtDeployer.pro | 2 ++
CQtDeployer/CQtDeployer.pro | 3 +++
CQtDeployerBinaries | 2 +-
CQtDeployerWinBuild.pri | 18 ++++++++++++++++++
4 files changed, 24 insertions(+), 1 deletion(-)
create mode 100644 CQtDeployerWinBuild.pri
diff --git a/CQtDeployer.pro b/CQtDeployer.pro
index 97629db..bb080d2 100644
--- a/CQtDeployer.pro
+++ b/CQtDeployer.pro
@@ -21,3 +21,5 @@ contains(DEFINES, WITH_TESTS) {
CQtDeployer.depends=QuasarAppLib
QuasarAppLib.file = $$PWD/QuasarAppLib/QuasarApp.pro
+
+win32:include('$$PWD/CQtDeployerWinBuild.pri')
diff --git a/CQtDeployer/CQtDeployer.pro b/CQtDeployer/CQtDeployer.pro
index 9f62e45..2739188 100644
--- a/CQtDeployer/CQtDeployer.pro
+++ b/CQtDeployer/CQtDeployer.pro
@@ -32,6 +32,7 @@ isEmpty(PREFIX){
}
include('$$PWD/../QuasarAppLib/QuasarLib.pri')
include('$$PWD/../QuasarAppLib/Etalons/qmake/install_prefix.pri')
+win32:include('$$PWD/CQtDeployerWinBuild.pri')
install_data.files += $$DESTDIR/$$runfiletype
install_data.files += $$QUASARAPP_LIB_OUTPUT_DIR/$$libfiletype
@@ -65,5 +66,7 @@ DISTFILES += \
../staticBuildCrossWin.sh \
../sharedBuild.bat
+
+
win32: LIBS += -lshlwapi
win32: RC_ICONS = $$PWD/../res/icon.ico
diff --git a/CQtDeployerBinaries b/CQtDeployerBinaries
index e046fd1..52375b4 160000
--- a/CQtDeployerBinaries
+++ b/CQtDeployerBinaries
@@ -1 +1 @@
-Subproject commit e046fd18e36c68aa9f1886c4057106f9a637ed07
+Subproject commit 52375b4fde67d4fd31eb614f9779fb897b64a83d
diff --git a/CQtDeployerWinBuild.pri b/CQtDeployerWinBuild.pri
new file mode 100644
index 0000000..84e3e1f
--- /dev/null
+++ b/CQtDeployerWinBuild.pri
@@ -0,0 +1,18 @@
+#
+# Copyright (C) 2018-2019 QuasarApp.
+# Distributed under the lgplv3 software license, see the accompanying
+# Everyone is permitted to copy and distribute verbatim copies
+# of this license document, but changing it is not allowed.
+#
+
+win32:CONFIG(release, debug|release): {
+ DEPLOYER = $$PWD/CQtDeployerBinaries/Windows/cqtdeployer.exe
+ DEPLOY_TARGET = $$PWD/build/release/cqtdeployer.exe
+ BASE_DEPLOY_FLAGS = clear -qmake $$QMAKE_QMAKE -targetDir $$PWD/distro -libDir $$PWD/ -recursiveDepth 5
+
+ deployTarget.commands = $$DEPLOYER $$BASE_DEPLOY_FLAGS -bin $$DEPLOY_TARGET
+
+ QMAKE_EXTRA_TARGETS += \
+ deployTarget
+
+}