Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

V1.5 #447

Merged
merged 5 commits into from
Nov 15, 2020
Merged

V1.5 #447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e67f42d
fix deploy libpng libjpeg and mysqlclient
EndrII Nov 15, 2020
52617e0
update 1.4.6.3
EndrII Nov 15, 2020
b1fd18e
Merge branch 'v1.4' into v1.5
EndrII Nov 15, 2020
aebf3da
v1.5.0.6
EndrII Nov 15, 2020
006a9cf
Merge branch 'v1.5' of github.com:QuasarApp/CQtDeployer into v1.5
EndrII Nov 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Deploy/Deploy.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ TEMPLATE = lib

DEFINES += DEPLOY_LIBRARY

VERSION = 1.5.0.5
VERSION = 1.5.0.6

DEFINES += APP_VERSION='\\"$$VERSION\\"'

Expand Down
6 changes: 5 additions & 1 deletion Deploy/deploycore.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,7 @@ QStringList DeployCore::Qt3rdpartyLibs(Platform platform) {
// See task https://github.com/QuasarApp/CQtDeployer/issues/367

"libpq",
"libmysqlclient"
"mysqlclient"

// End SQL LIBS
};
Expand Down Expand Up @@ -602,6 +602,10 @@ QStringList DeployCore::Qt3rdpartyLibs(Platform platform) {

// xcb plugin
"libxcb-xinerama",

// qt GUI
"libpng",
"libjpeg"
};
}

Expand Down
2 changes: 1 addition & 1 deletion QIFData/config/configLinux.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion QIFData/config/configWin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion QIFData/packages/cqtdeployer.1_5/meta/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions snap/gui/cqtdeployer.desktop
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[Desktop Entry]
Version=1.5.0.5
Version=1.5.0.6
Name=CQtDeployer
Comment=CQtDeployer Help.
Exec=cqtdeployer
Expand All @@ -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
2 changes: 1 addition & 1 deletion snap/snapcraft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down