Merge pull request #376 from QuasarApp/v1.5

V1.5

Deploy/Deploy.pro

@@ -19,7 +19,7 @@ TEMPLATE = lib
 
 DEFINES += DEPLOY_LIBRARY
 
-VERSION = 1.4.3.3
+VERSION = 1.4.4.0
 
 DEFINES += APP_VERSION='\\"$$VERSION\\"'
 

Deploy/Distributions/qif.cpp

@@ -14,23 +14,29 @@ QIF::QIF(FileManager *fileManager)
 
 Envirement QIF::toolKitEnv() const {
     Envirement result;
-    result.addEnv(QProcessEnvironment::systemEnvironment().value("PATH"));
 
-// BASE
-    const DeployConfig *cfg = DeployCore::_config;
-    auto basePATH = cfg->qtDir.getBins() + "/../../../Tools/QtInstallerFramework/";
-    QDir QifDir(basePATH);
-    auto list = QifDir.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
+    if (QuasarAppUtils::Params::isEndable("qifFromSystem")) {
+        result.addEnv(QProcessEnvironment::systemEnvironment().value("PATH"));
 
-    QMap<double, QString> sortedItems;
-    for (const auto& i : list) {
-        sortedItems.insert(i.toDouble(), i);
+    // BASE
+        const DeployConfig *cfg = DeployCore::_config;
+        auto basePATH = cfg->qtDir.getBins() + "/../../../Tools/QtInstallerFramework/";
+        QDir QifDir(basePATH);
+        auto list = QifDir.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
+
+        QMap<double, QString> sortedItems;
+        for (const auto& i : list) {
+            sortedItems.insert(i.toDouble(), i);
+        }
+
+        if (sortedItems.size()) {
+            basePATH += ("/" + sortedItems.last() + "/bin");
+            result.addEnv(basePATH);
+        }
+
+        return result;
     }
 
-    if (sortedItems.size()) {
-        basePATH += ("/" + sortedItems.last() + "/bin");
-        result.addEnv(basePATH);
-    }
 
 
 // SNAP

Deploy/deploycore.cpp

@@ -188,6 +188,7 @@ void DeployCore::help() {
                  " which will not be compatible with equipment on users' hosts."},
                 {"allQmlDependes", "Extracts all the qml libraries. (not recommended, as it takes great amount of computer memory)"},
                 {"qif", "Create the QIF installer for deployement programm"},
+                {"qifFromSystem", "force use system binarycreator tool of qif from path or qt"},
                 {"deploySystem", "Deploys all libraries  (do not work in snap )"},
                 {"deploySystem-with-libc", "deploy all libs libs (only linux) (do not work in snap )"},
 
@@ -276,7 +277,8 @@ QStringList DeployCore::helpKeys() {
         "noStrip",
         "extractPlugins",
         "noTranslations",
-        "noRecursiveiIgnoreEnv"
+        "noRecursiveiIgnoreEnv",
+        "qifFromSystem",
         "qmlOut",
         "libOut",
         "trOut",

QIFData/config/configLinux.xml

@@ -3,7 +3,7 @@
     <WizardDefaultWidth>640px</WizardDefaultWidth>
     <WizardDefaultHeight>400px</WizardDefaultHeight>
     <Name>CQtDeployer</Name>
-    <Version>1.4.3.3</Version>
+    <Version>1.4.4.0</Version>
     <Title>CQtDeployer</Title>
     <Publisher>QuasarApp</Publisher>
     <StartMenuDir>CQtDeployer</StartMenuDir>

QIFData/config/configWin.xml

@@ -3,7 +3,7 @@
     <WizardDefaultWidth>640px</WizardDefaultWidth>
     <WizardDefaultHeight>400px</WizardDefaultHeight>
     <Name>CQtDeployer</Name>
-    <Version>1.4.3.3</Version>
+    <Version>1.4.4.0</Version>
     <Title>CQtDeployer</Title>
     <Publisher>QuasarApp</Publisher>
     <StartMenuDir>CQtDeployer</StartMenuDir>

QIFData/packages/cqtdeployer.1_4/meta/package.xml

@@ -2,7 +2,7 @@
 <Package>
     <DisplayName>CQtDeployer 1.4</DisplayName>
     <Description>CQtDeployer 1.4</Description>
-    <Version>1.4.3.3</Version>
+    <Version>1.4.4.0</Version>
     <Default>true</Default>
     <ForcedInstallation>false</ForcedInstallation>
     <Script>installscript.js</Script>

README.md

@@ -1,6 +1,6 @@
 # CQtDeployer [![cqtdeployer](https://snapcraft.io//cqtdeployer/badge.svg)](https://snapcraft.io/cqtdeployer)
 [![cqtdeployer](https://snapcraft.io//cqtdeployer/trending.svg?name=0)](https://snapcraft.io/cqtdeployer)
-# ![Logo](https://i.ibb.co/phDBvfr/qt.png)
+# ![Logo](res/CQtDeployer_banner_web.png)
 
 ****************************
 

doc/wiki

@@ -1 +1 @@
-Subproject commit 0813954304b01307c968f429d776215cd1b760cd
+Subproject commit 68f4daac00f7780cbae69b18ed83d0837fd93e04

snap/gui/cqtdeployer.desktop

@@ -1,5 +1,5 @@
 [Desktop Entry]
-Version=1.4.3.3
+Version=1.4.4.0
 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.4.3.3
+X-GNOME-Bugzilla-Version=1.4.4.0
 StartupNotify=true
 Name[ru_RU]=CQtDeployer

snap/snapcraft.yaml

@@ -6,7 +6,7 @@
 #
 
 name: cqtdeployer # you probably want to 'snapcraft register <name>'
-version: '1.4.3.3' # just for humans, typically '1.2+git' or '1.3.2'
+version: '1.4.4.0' # 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.