fix #361 (fix build on old ldts qt versions 5.9 and 5.12)

This commit is contained in:
Andrei Yankovich 2020-05-09 20:01:19 +03:00
parent a79a366aef
commit 55d9d6e203
2 changed files with 10 additions and 0 deletions

View File

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

View File

@ -52,7 +52,11 @@ void FileManager::loadDeployemendFiles(const QString &targetDir) {
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()));
#endif
}