Merge pull request #447 from QuasarApp/v1.5

V1.5
QuasarApp · Nov 15, 2020 · 386deab · 386deab
2 parents 224ee1d + 006a9cf
commit 386deab
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 8 deletions.
diff --git a/Deploy/Deploy.pro b/Deploy/Deploy.pro
@@ -19,7 +19,7 @@ TEMPLATE = lib
 
 DEFINES += DEPLOY_LIBRARY
 
-VERSION = 1.5.0.5
+VERSION = 1.5.0.6
 
 DEFINES += APP_VERSION='\\"$$VERSION\\"'
 

diff --git a/Deploy/deploycore.cpp b/Deploy/deploycore.cpp
@@ -563,7 +563,7 @@ QStringList DeployCore::Qt3rdpartyLibs(Platform platform) {
               // See task https://github.com/QuasarApp/CQtDeployer/issues/367
 
               "libpq",
-              "libmysqlclient"
+              "mysqlclient"
 
               // End SQL LIBS
 };
@@ -602,6 +602,10 @@ QStringList DeployCore::Qt3rdpartyLibs(Platform platform) {
 
                   // xcb plugin
                   "libxcb-xinerama",
+
+                  // qt GUI
+                  "libpng",
+                  "libjpeg"
     };
     }
 

diff --git a/QIFData/config/configLinux.xml b/QIFData/config/configLinux.xml
@@ -3,7 +3,7 @@
     <WizardDefaultWidth>640px</WizardDefaultWidth>
     <WizardDefaultHeight>400px</WizardDefaultHeight>
     <Name>CQtDeployer</Name>
-    <Version>1.5.0.5</Version>
+    <Version>1.5.0.6</Version>
     <Title>CQtDeployer</Title>
     <Publisher>QuasarApp</Publisher>
     <StartMenuDir>CQtDeployer</StartMenuDir>

diff --git a/QIFData/config/configWin.xml b/QIFData/config/configWin.xml
@@ -3,7 +3,7 @@
     <WizardDefaultWidth>640px</WizardDefaultWidth>
     <WizardDefaultHeight>400px</WizardDefaultHeight>
     <Name>CQtDeployer</Name>
-    <Version>1.5.0.5</Version>
+    <Version>1.5.0.6</Version>
     <Title>CQtDeployer</Title>
     <Publisher>QuasarApp</Publisher>
     <StartMenuDir>CQtDeployer</StartMenuDir>

diff --git a/QIFData/packages/cqtdeployer.1_5/meta/package.xml b/QIFData/packages/cqtdeployer.1_5/meta/package.xml
@@ -2,7 +2,7 @@
 <Package>
     <DisplayName>CQtDeployer 1.5 Alpha</DisplayName>
     <Description>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.</Description>
-    <Version>1.5.0.5</Version>
+    <Version>1.5.0.6</Version>
     <Default>true</Default>
     <ForcedInstallation>false</ForcedInstallation>
     <Script>installscript.js</Script>

diff --git a/snap/gui/cqtdeployer.desktop b/snap/gui/cqtdeployer.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Version=1.5.0.5
+Version=1.5.0.6
 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.5
+X-GNOME-Bugzilla-Version=1.5.0.6
 StartupNotify=true
 Name[ru_RU]=CQtDeployer
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -6,7 +6,7 @@
 #
 
 name: cqtdeployer # you probably want to 'snapcraft register <name>'
-version: '1.5.0.5' # just for humans, typically '1.2+git' or '1.3.2'
+version: '1.5.0.6' # 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.