diff --git a/Deploy/Deploy.pro b/Deploy/Deploy.pro index 6d0dec1..660b1e5 100644 --- a/Deploy/Deploy.pro +++ b/Deploy/Deploy.pro @@ -19,7 +19,7 @@ TEMPLATE = lib DEFINES += DEPLOY_LIBRARY -VERSION = 1.4.5.0 +VERSION = 1.4.5.1 DEFINES += APP_VERSION='\\"$$VERSION\\"' diff --git a/Deploy/extracter.cpp b/Deploy/extracter.cpp index 2160236..48b8df7 100644 --- a/Deploy/extracter.cpp +++ b/Deploy/extracter.cpp @@ -53,16 +53,24 @@ bool Extracter::extractWebEngine() { const auto &package = i.key(); if (isWebEngine(package)) { auto webEngeneBin = cnf->qtDir.getLibexecs(); + if (cnf->qtDir.getQtPlatform() & Platform::Unix) { webEngeneBin += "/QtWebEngineProcess"; } else { webEngeneBin += "/QtWebEngineProcess.exe"; + } auto destWebEngine = cnf->getTargetDir() + "/" + package + cnf->packages()[package].getBinOutDir(); auto resOut = cnf->getTargetDir() + "/" + package + cnf->packages()[package].getResOutDir(); + auto libOut = cnf->getTargetDir() + "/" + package + cnf->packages()[package].getLibOutDir(); + auto res = cnf->qtDir.getResources(); + if (!_fileManager->copyFiles(angleGLLibs(), libOut)) { + return false; + } + if (!_fileManager->copyFile(webEngeneBin, destWebEngine)) { return false; } @@ -76,6 +84,21 @@ bool Extracter::extractWebEngine() { return true; } +QList<QString> Extracter::angleGLLibs() { + auto cnf = DeployCore::_config; + + if (cnf->qtDir.getQtPlatform() & Platform::Win) { + return { + cnf->qtDir.getBins() + "/d3dcompiler_47.dll", + cnf->qtDir.getBins() + "/libEGL.dll", + cnf->qtDir.getBins() + "/libGLESv2.dll", + }; + } + + return {}; + +} + void Extracter::extractAllTargets() { auto cfg = DeployCore::_config; for (auto i = cfg->packages().cbegin(); i != cfg->packages().cend(); ++i) { diff --git a/Deploy/extracter.h b/Deploy/extracter.h index 8c9fa2a..763ec29 100644 --- a/Deploy/extracter.h +++ b/Deploy/extracter.h @@ -54,6 +54,14 @@ private: bool deployMSVC(); bool extractWebEngine(); + + /** + * @brief angleGLLibs - + * @note see task 398 (https://github.com/QuasarApp/CQtDeployer/issues/398) + * @return + */ + QList<QString> angleGLLibs(); + /** * @brief compress - this function join all target dependecies in to one struct */ diff --git a/QIFData/config/configLinux.xml b/QIFData/config/configLinux.xml index f53cf0e..a983360 100644 --- 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.4.5.0</Version> + <Version>1.4.5.1</Version> <Title>CQtDeployer</Title> <Publisher>QuasarApp</Publisher> <StartMenuDir>CQtDeployer</StartMenuDir> diff --git a/QIFData/config/configWin.xml b/QIFData/config/configWin.xml index f83d723..0a40325 100644 --- 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.4.5.0</Version> + <Version>1.4.5.1</Version> <Title>CQtDeployer</Title> <Publisher>QuasarApp</Publisher> <StartMenuDir>CQtDeployer</StartMenuDir> diff --git a/QIFData/packages/cqtdeployer.1_4/meta/package.xml b/QIFData/packages/cqtdeployer.1_4/meta/package.xml index f0de98b..41eb392 100644 --- a/QIFData/packages/cqtdeployer.1_4/meta/package.xml +++ b/QIFData/packages/cqtdeployer.1_4/meta/package.xml @@ -2,11 +2,11 @@ <Package> <DisplayName>CQtDeployer 1.4</DisplayName> <Description>CQtDeployer 1.4</Description> - <Version>1.4.5.0</Version> + <Version>1.4.5.1</Version> <Default>true</Default> <ForcedInstallation>false</ForcedInstallation> <Script>installscript.js</Script> - <ReleaseDate>2020-07-09</ReleaseDate> + <ReleaseDate>2020-08-22</ReleaseDate> <SortingPriority>201</SortingPriority> <Translations> <Translation>ru.qm</Translation> diff --git a/snap/gui/cqtdeployer.desktop b/snap/gui/cqtdeployer.desktop index 7c817c0..d8e7135 100755 --- a/snap/gui/cqtdeployer.desktop +++ b/snap/gui/cqtdeployer.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Version=1.4.5.0 +Version=1.4.5.1 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.5.0 +X-GNOME-Bugzilla-Version=1.4.5.1 StartupNotify=true Name[ru_RU]=CQtDeployer diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 75063d2..c51d6fa 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -6,7 +6,7 @@ # name: cqtdeployer # you probably want to 'snapcraft register <name>' -version: '1.4.5.0' # just for humans, typically '1.2+git' or '1.3.2' +version: '1.4.5.1' # 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.