fix linux build

This commit is contained in:
Andrei Yankovich 2018-08-19 18:58:56 +03:00
parent 9fc5daf9ea
commit 434dd247b1
7 changed files with 10 additions and 5 deletions

3
.gitmodules vendored
View File

@ -1,3 +1,6 @@
[submodule "QuasarAppLib"] [submodule "QuasarAppLib"]
path = QuasarAppLib path = QuasarAppLib
url = git@github.com:QuasarApp/QuasarAppLib.git url = git@github.com:QuasarApp/QuasarAppLib.git
[submodule "CQtDeployer"]
path = CQtDeployer
url = git@github.com:QuasarApp/Console-QtDeployer.git

1
CQtDeployer Submodule

@ -0,0 +1 @@
Subproject commit d456ce7f86f2d4c0cc53442e4b00273815a89d6f

View File

@ -7,7 +7,8 @@ message( DEPLOY_FILES_MASTER = $$DEPLOY_FILES)
SUBDIRS += Sync \ SUBDIRS += Sync \
QuasarAppLib/QuasarApp.pro \ QuasarAppLib/QuasarApp.pro \
SoundBand SoundBand \
CQtDeployer
SoundBand.depends = Sync QuasarAppLib/QuasarApp.pro SoundBand.depends = Sync QuasarAppLib/QuasarApp.pro

View File

@ -12,5 +12,5 @@
<Logo>iconInstaller.png</Logo> <Logo>iconInstaller.png</Logo>
<InstallerWindowIcon>iconInstaller</InstallerWindowIcon> <InstallerWindowIcon>iconInstaller</InstallerWindowIcon>
<InstallerApplicationIcon>iconInstaller</InstallerApplicationIcon> <InstallerApplicationIcon>iconInstaller</InstallerApplicationIcon>
<RunProgram>@TargetDir@/AppRun</RunProgram> <RunProgram>@TargetDir@/AppRun.sh</RunProgram>
</Installer> </Installer>

View File

@ -22,7 +22,7 @@ QML_DIR = $$QT_DIR/../qml
WINDEPLY = $$QT_DIR/windeployqt.exe WINDEPLY = $$QT_DIR/windeployqt.exe
MACDEPLY = $$QT_DIR/macdeployqt MACDEPLY = $$QT_DIR/macdeployqt
LINUXDEPLOY = $$PWD/deploy/CQtDeployer/build/CQtDeployer LINUXDEPLOY = $$PWD/../CQtDeployer/build/CQtDeployer
message( QML_DIR = $$QML_DIR) message( QML_DIR = $$QML_DIR)
message( WINDEPLY = $$WINDEPLY) message( WINDEPLY = $$WINDEPLY)
@ -49,7 +49,7 @@ win32 {
unix { unix {
for(command, TARGET_LIST) { for(command, TARGET_LIST) {
installerApp.commands += $$LINUXDEPLOY -bin $$TARGET_PATH/$$command -qmldir=$$QML_DIR -qmake=$$QMAKE_QMAKE && installerApp.commands += $$LINUXDEPLOY -bin $$TARGET_PATH/$$command -qmlDir $$QML_DIR -qmake $$QMAKE_QMAKE &&
} }
commands += "chmod +x $$LINUXDEPLOY" commands += "chmod +x $$LINUXDEPLOY"
} }

View File

@ -52,7 +52,7 @@ Component.prototype.createOperations = function()
"Version=@Version@\n "Version=@Version@\n
Type=Application\n Type=Application\n
Terminal=false\n Terminal=false\n
Exec=@TargetDir@/AppRun\n Exec=@TargetDir@/AppRun.sh\n
Name=@Name@\n Name=@Name@\n
Icon=@TargetDir@/icons/icon.png\n Icon=@TargetDir@/icons/icon.png\n
Name[en_US]=@Name@"); Name[en_US]=@Name@");