diff --git a/CQtDeployer/main.cpp b/CQtDeployer/main.cpp
index a39914a..7108465 100644
--- a/CQtDeployer/main.cpp
+++ b/CQtDeployer/main.cpp
@@ -28,5 +28,12 @@ int main(int argc, char *argv[]) {
}
Deploy deploy;
- return deploy.run();
+
+ int code = deploy.run();
+
+ if (code) {
+ QuasarAppUtils::Params::log(Deploy::codeString(code), QuasarAppUtils::Error);
+ }
+
+ return code;
}
diff --git a/Deploy/Deploy.pro b/Deploy/Deploy.pro
index fa9f05e..32e6e08 100644
--- a/Deploy/Deploy.pro
+++ b/Deploy/Deploy.pro
@@ -19,7 +19,7 @@ TEMPLATE = lib
DEFINES += DEPLOY_LIBRARY
-VERSION = 1.5.0.26
+VERSION = 1.5.0.27
DEFINES += APP_VERSION='\\"$$VERSION\\"'
diff --git a/Deploy/deploy.cpp b/Deploy/deploy.cpp
index 5d75556..1e6f9dd 100644
--- a/Deploy/deploy.cpp
+++ b/Deploy/deploy.cpp
@@ -73,6 +73,25 @@ Deploy::~Deploy() {
DeployCore::_config = nullptr;
}
+QString Deploy::codeString(int code) {
+ switch (code) {
+ case exitCodes::DeployError: {
+ return "The CQtDeployer fail to deploy application.";
+ }
+ case exitCodes::PackingError: {
+ return "The CQtDeployer fail to Pack application.";
+ }
+ case exitCodes::PrepareError: {
+ return "The CQtDeployer fail to read configuration.";
+ }
+
+ default: return "";
+
+ }
+
+ return "";
+}
+
bool Deploy::prepare() {
diff --git a/Deploy/deploy.h b/Deploy/deploy.h
index 833632f..1e79021 100644
--- a/Deploy/deploy.h
+++ b/Deploy/deploy.h
@@ -50,6 +50,12 @@ public:
int run();
~Deploy();
+ /**
+ * @brief codeString This method retun string message about input code.
+ * @param code This is error code;
+ * @return Message of code.
+ */
+ static QString codeString(int code);
friend class deploytest;
};
diff --git a/QIFData/config/configLinux.xml b/QIFData/config/configLinux.xml
index 1e24e0d..b667c33 100644
--- a/QIFData/config/configLinux.xml
+++ b/QIFData/config/configLinux.xml
@@ -3,7 +3,7 @@
640px
400px
CQtDeployer
- 1.5.0.26
+ 1.5.0.27
CQtDeployer
QuasarApp
CQtDeployer
diff --git a/QIFData/config/configWin.xml b/QIFData/config/configWin.xml
index 578719c..9978635 100644
--- a/QIFData/config/configWin.xml
+++ b/QIFData/config/configWin.xml
@@ -3,7 +3,7 @@
640px
400px
CQtDeployer
- 1.5.0.26
+ 1.5.0.27
CQtDeployer
QuasarApp
CQtDeployer
diff --git a/QIFData/packages/cqtdeployer.1_5/meta/package.xml b/QIFData/packages/cqtdeployer.1_5/meta/package.xml
index 8042dfd..48f1c08 100644
--- a/QIFData/packages/cqtdeployer.1_5/meta/package.xml
+++ b/QIFData/packages/cqtdeployer.1_5/meta/package.xml
@@ -1,12 +1,12 @@
- CQtDeployer 1.5 Alpha
- CQtDeployer 1.5 Alpha. Do not use this version because it is unstable and may lead to unwanted bugs or consequences. Use this version exclusively for testing new functionality.
- 1.5.0.26
+ CQtDeployer 1.5 Beta
+ CQtDeployer 1.5 Beta. Do not use this version because it is unstable and may lead to unwanted bugs or consequences. Use this version exclusively for testing new functionality.
+ 1.5.0.27
true
false
- 2021-02-28
+ 2021-04-07
201
ru.qm
diff --git a/QuasarAppLib b/QuasarAppLib
index 681d249..d978f47 160000
--- a/QuasarAppLib
+++ b/QuasarAppLib
@@ -1 +1 @@
-Subproject commit 681d2492db28ad494e67d5bd11de152a09195866
+Subproject commit d978f47ea5c4750184ae802e79f1f5bc18b95f2f
diff --git a/doxygen.conf b/doxygen.conf
index 04a03c2..eea49e1 100644
--- a/doxygen.conf
+++ b/doxygen.conf
@@ -703,7 +703,7 @@ FILE_VERSION_FILTER =
# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
# tag is left empty.
-LAYOUT_FILE = QuasarAppLib/DoxyStyle/DoxygenLayout.xml
+LAYOUT_FILE = QuasarAppLib/CMake/DoxyStyle/DoxygenLayout.xml
# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
# the reference definitions. This must be a list of .bib files. The .bib
@@ -1196,7 +1196,7 @@ HTML_STYLESHEET =
# list). For an example see the documentation.
# This tag requires that the tag GENERATE_HTML is set to YES.
-HTML_EXTRA_STYLESHEET = QuasarAppLib/DoxyStyle/doxygenStyles.css
+HTML_EXTRA_STYLESHEET = QuasarAppLib/CMake/DoxyStyle/doxygenStyles.css
# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
# other source files which should be copied to the HTML output directory. Note
diff --git a/snap/gui/cqtdeployer.desktop b/snap/gui/cqtdeployer.desktop
index d6ffdc3..8b72d1b 100755
--- a/snap/gui/cqtdeployer.desktop
+++ b/snap/gui/cqtdeployer.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Version=1.5.0.26
+Version=1.5.0.27
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.0.26
+X-GNOME-Bugzilla-Version=1.5.0.27
StartupNotify=true
Name[ru_RU]=CQtDeployer
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 648b2a0..8437fe8 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -6,7 +6,7 @@
#
name: cqtdeployer # you probably want to 'snapcraft register '
-version: '1.5.0.26' # just for humans, typically '1.2+git' or '1.3.2'
+version: '1.5.0.27' # 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.