fix build with new lib

This commit is contained in:
Andrei Yankovich 2018-09-30 16:35:51 +03:00
parent 228054f51a
commit 7492728b74
5 changed files with 13 additions and 2 deletions

View File

@ -23,11 +23,13 @@ DEFINES += QT_DEPRECATED_WARNINGS
# You can also select to disable deprecated APIs only up to a certain version of Qt.
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
include('$$PWD/../QuasarAppLib/targetdir.pri');
include('$$PWD/../deploy.pri')
include('$$PWD/../QuasarAppLib/QuasarLib.pri');
TARGET = cqtdeployer
INSTALLS.files($$PWD/../QuasarAppLib/build/*)
SOURCES += \
main.cpp \
deploy.cpp

@ -1 +1 @@
Subproject commit 3178bcbfc8e07b71201aa6316a991cf632c4d1e3
Subproject commit 381518d52a122f6892e12d8480de40d61ed44e2c

2
deploy.pri Executable file
View File

@ -0,0 +1,2 @@
DESTDIR=$$PWD/build

View File

@ -5,6 +5,8 @@ declare -a QTLIBS
BASE_DIR=$(dirname "$(readlink -f "$0")")
QTLIBS=( libQt5Sql.so libQt5Xml.so libQt5Core.so libQt5Test.so libQt5Network.so libQt5Concurrent.so)
git submodule update --init --recursive
make clean
find $BASE_DIR -type f -name 'Makefile' -exec rm {} \;
@ -32,6 +34,9 @@ export PATH=$PATH:$BASE_DIR/sharedQt
$BASE_DIR/sharedQt/bin/qmake CQtDeployer.pro
make -j$(nproc)
mv $BASE_DIR/QuasarAppLib/build/* $BASE_DIR/build
strip build/*
chmod +x $BASE_DIR/build/cqtdeployer

View File

@ -6,6 +6,8 @@ BASE_DIR=$(dirname "$(readlink -f "$0")")
QTLIBS=( libQt5Sql.a libQt5Xml.a libQt5Core.a libQt5Test.a libQt5Network.a libQt5Bootstrap.a libQt5Concurrent.a)
echo "base dir $BASE_DIR"
git submodule update --init --recursive
make clean
find $BASE_DIR -type f -name 'Makefile' -exec rm {} \;
cd $BASE_DIR/qtBase