QuasarApp/CQtDeployer
4
1
Fork 0
mirror of https://github.com/QuasarApp/CQtDeployer.git synced 2025-05-02 04:29:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #363 from QuasarApp/v1.5

Browse Source 
V1.5
This commit is contained in:
Andrei Yankovich 2020-05-09 21:10:16 +03:00 committed by GitHub
commit a18b458d50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CQtDeployer.pro
View File

@ -7,6 +7,12 @@
TEMPLATE = subdirs TEMPLATE = subdirs
CONFIG += ordered CONFIG += ordered
lessThan(QT_MAJOR_VERSION, 6):lessThan(QT_MINOR_VERSION, 14) {
message(Tests is disabled!)
DEFINES += WITHOUT_TESTS
}
!android { !android {
SUBDIRS += QuasarAppLib \ SUBDIRS += QuasarAppLib \
Pe \ Pe \

4
Deploy/filemanager.cpp
View File

@ -52,7 +52,11 @@ void FileManager::loadDeployemendFiles(const QString &targetDir) {
QStringList deployedFiles = settings->getValue(targetDir, "").toStringList(); QStringList deployedFiles = settings->getValue(targetDir, "").toStringList();
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
_deployedFiles.unite(deployedFiles.toSet());
#else
_deployedFiles.unite(QSet<QString>(deployedFiles.begin(), deployedFiles.end())); _deployedFiles.unite(QSet<QString>(deployedFiles.begin(), deployedFiles.end()));
#endif
} }