diff --git a/src/Deploy/src/Distributions/deb.cpp b/src/Deploy/src/Distributions/deb.cpp index 7380cd35..7f617a40 100644 --- a/src/Deploy/src/Distributions/deb.cpp +++ b/src/Deploy/src/Distributions/deb.cpp @@ -116,7 +116,7 @@ QProcessEnvironment Deb::processEnvirement() const { QList Deb::runCmd() { QList res; - for (const auto& inout: qAsConst(inouts)) { + for (const auto& inout: std::as_const(inouts)) { res.push_back({"dpkg-deb", QStringList{"--build", "--verbose"} << inout.input << inout.output}); } @@ -125,7 +125,7 @@ QList Deb::runCmd() { QStringList Deb::outPutFiles() const { QStringList result; - for (const auto& inout: qAsConst(inouts)) { + for (const auto& inout: std::as_const(inouts)) { result.push_back(inout.output); } return result; diff --git a/src/Deploy/src/configparser.cpp b/src/Deploy/src/configparser.cpp index c0543276..6abd29cc 100644 --- a/src/Deploy/src/configparser.cpp +++ b/src/Deploy/src/configparser.cpp @@ -966,7 +966,7 @@ bool ConfigParser::setTargetsInDir(const QString &dir, bool recursive) { } bool result = false; - for (const auto &file : qAsConst(list)) { + for (const auto &file : std::as_const(list)) { if (file.isDir()) { result |= setTargetsInDir(file.absoluteFilePath(), recursive); diff --git a/src/Deploy/src/dependenciesscanner.cpp b/src/Deploy/src/dependenciesscanner.cpp index c63e211b..c0b2e1d4 100644 --- a/src/Deploy/src/dependenciesscanner.cpp +++ b/src/Deploy/src/dependenciesscanner.cpp @@ -125,7 +125,7 @@ void DependenciesScanner::recursiveDep(LibInfo &lib, QSet &res, QSetcopyFiles(plugins, targetPath + distro.getPluginsOutDir(), 1, DeployCore::debugExtensions(), &listItems); - for (const auto &item : qAsConst(listItems)) { + for (const auto &item : std::as_const(listItems)) { extractPluginLib(item, i.key()); } @@ -281,7 +281,7 @@ bool Extracter::copyTr() { if (info.isDir()) { QDir dir(info.absoluteFilePath()); auto availableQm = dir.entryInfoList({"*.qm"}, QDir::Files); - for (const auto & trFile : qAsConst(availableQm)) { + for (const auto & trFile : std::as_const(availableQm)) { if (!_fileManager->copyFile(trFile.absoluteFilePath(), cnf->getPackageTargetDir(i.key()) + i->getTrOutDir())) { return false; @@ -415,7 +415,7 @@ void Extracter::extractLib(const QString &file, allDependencies = _scaner->scan(file).getAllDep(); } - for (const auto &line : qAsConst(allDependencies)) { + for (const auto &line : std::as_const(allDependencies)) { if (mask.size() && !line.getName().contains(mask, DeployCore::getCaseSensitivity())) { continue; @@ -500,7 +500,7 @@ bool Extracter::extractQml() { return false; } } else { - for (const auto& plugin: qAsConst(plugins)) { + for (const auto& plugin: std::as_const(plugins)) { const auto qmlFiles = QDir(plugin).entryInfoList(QDir::Files); for (const auto& qmlFile: qmlFiles) { toCopyQmlFiles.push_back(qmlFile.absoluteFilePath()); @@ -520,7 +520,7 @@ bool Extracter::extractQml() { } - for (const auto &item : qAsConst(listItems)) { + for (const auto &item : std::as_const(listItems)) { extractPluginLib(item, i.key()); } diff --git a/src/Deploy/src/filemanager.cpp b/src/Deploy/src/filemanager.cpp index df8d91da..365cb36c 100644 --- a/src/Deploy/src/filemanager.cpp +++ b/src/Deploy/src/filemanager.cpp @@ -180,7 +180,7 @@ bool FileManager::fileActionPrivate(const QString &file, const QString &target, bool copy = !masks; if (masks) { - for (const auto &mask : qAsConst(*masks)) { + for (const auto &mask : std::as_const(*masks)) { if (info.absoluteFilePath().contains(mask, DeployCore::getCaseSensitivity())) { copy = true; break; @@ -432,7 +432,7 @@ void FileManager::clear(const QString& targetDir, bool force) { } QMultiMap sortedOldData; - for (const auto& i : qAsConst(_deployedFiles)) { + for (const auto& i : std::as_const(_deployedFiles)) { sortedOldData.insert(i.size(), QFileInfo(i)); } diff --git a/src/Deploy/src/ignorerule.cpp b/src/Deploy/src/ignorerule.cpp index 91bd7134..2ca7f79f 100644 --- a/src/Deploy/src/ignorerule.cpp +++ b/src/Deploy/src/ignorerule.cpp @@ -9,7 +9,7 @@ #include bool IgnoreRule::checkOnlytext(const QString &lib) { - for (const auto &ignore : qAsConst(_data)) { + for (const auto &ignore : std::as_const(_data)) { if (lib.contains(ignore.label)) { return true; } diff --git a/src/Deploy/src/packing.cpp b/src/Deploy/src/packing.cpp index 6d70e4a5..974a57e9 100644 --- a/src/Deploy/src/packing.cpp +++ b/src/Deploy/src/packing.cpp @@ -83,7 +83,7 @@ bool Packing::create() { return false; } - for (auto package : qAsConst(_pakages)) { + for (auto package : std::as_const(_pakages)) { if (!package) { internalError(); @@ -207,7 +207,7 @@ bool Packing::extractTemplates() { return false; } - for (auto package : qAsConst(_pakages)) { + for (auto package : std::as_const(_pakages)) { if (!package) return false; diff --git a/src/Deploy/src/pluginsparser.cpp b/src/Deploy/src/pluginsparser.cpp index 1ed2d4ea..1c6294e6 100644 --- a/src/Deploy/src/pluginsparser.cpp +++ b/src/Deploy/src/pluginsparser.cpp @@ -163,7 +163,7 @@ void PluginsParser::addPlugins(const QStringList& list, const QString& package, QHash>& container) { const DeployConfig* cnf = DeployCore::_config; - for (const auto &plugin: qAsConst(list)) { + for (const auto &plugin: std::as_const(list)) { if (QFileInfo(cnf->qtDir.getPlugins() + "/" + plugin).isDir()) { auto listPlugins = QDir(cnf->qtDir.getPlugins() + "/" + plugin).entryInfoList(QDir::Files | QDir::NoDotAndDotDot); diff --git a/src/Deploy/src/qmlqt5.cpp b/src/Deploy/src/qmlqt5.cpp index 243159cf..e7e7aede 100644 --- a/src/Deploy/src/qmlqt5.cpp +++ b/src/Deploy/src/qmlqt5.cpp @@ -79,7 +79,7 @@ bool QMLQt5::extractImportsFromDir(const QString &path, bool recursive) { for (const auto &info: files) { auto imports = extractImportsFromFile(info.absoluteFilePath()); - for (const auto &import : qAsConst(imports)) { + for (const auto &import : std::as_const(imports)) { if (!_imports.contains(import)) { _imports.insert(import); extractImportsFromDir(getPathFromImport(import), recursive); @@ -87,10 +87,10 @@ bool QMLQt5::extractImportsFromDir(const QString &path, bool recursive) { } } - for (const auto& module: qAsConst(qmlmodule)) { + for (const auto& module: std::as_const(qmlmodule)) { QStringList imports = extractImportsFromQmlModule(module.absoluteFilePath()); - for (const auto &import : qAsConst(imports)) { + for (const auto &import : std::as_const(imports)) { if (!_imports.contains(import)) { _imports.insert(import); extractImportsFromDir(getPathFromImport(import), recursive); @@ -155,7 +155,7 @@ bool QMLQt5::deployPath(const QString &path, QStringList &res) { QDir dir(path); auto infoList = dir.entryInfoList(QDir::NoDotAndDotDot | QDir::Files | QDir::Dirs); - for (const auto &info : qAsConst(infoList)) { + for (const auto &info : std::as_const(infoList)) { if (DeployCore::isDebugFile(info.fileName())) { QuasarAppUtils::Params::log("Skip debug library " + info.absoluteFilePath()); @@ -222,7 +222,7 @@ bool QMLQt5::scan(QStringList &res, const QString& _qmlProjectDir) { return false; } - for (const auto &import : qAsConst(_imports)) { + for (const auto &import : std::as_const(_imports)) { res.push_back(getPathFromImport(import)); } diff --git a/src/Deploy/src/qmlqt6.cpp b/src/Deploy/src/qmlqt6.cpp index e81eccfd..0de6eac1 100644 --- a/src/Deploy/src/qmlqt6.cpp +++ b/src/Deploy/src/qmlqt6.cpp @@ -69,7 +69,7 @@ bool QMLQt6::extractImportsFromDir(const QString &path, bool recursive) { for (const auto &info: files) { auto imports = extractImportsFromFile(info.absoluteFilePath()); - for (const auto &import : qAsConst(imports)) { + for (const auto &import : std::as_const(imports)) { if (!_imports.contains(import)) { _imports.insert(import); extractImportsFromDir(getPathFromImport(import), false); @@ -77,11 +77,11 @@ bool QMLQt6::extractImportsFromDir(const QString &path, bool recursive) { } } - for (const auto& module: qAsConst(qmlmodule)) { + for (const auto& module: std::as_const(qmlmodule)) { QStringList imports = extractImportsFromQmlModule(module.absoluteFilePath()); imports += extractImportsFromFile(module.absoluteFilePath()); - for (const auto &import : qAsConst(imports)) { + for (const auto &import : std::as_const(imports)) { if (!_imports.contains(import)) { _imports.insert(import); extractImportsFromDir(getPathFromImport(import), false); @@ -153,7 +153,7 @@ bool QMLQt6::deployPath(const QString &path, QStringList &res) { QDir dir(path); auto infoList = dir.entryInfoList(QDir::NoDotAndDotDot | QDir::Files | QDir::Dirs); - for (const auto &info : qAsConst(infoList)) { + for (const auto &info : std::as_const(infoList)) { if (DeployCore::isDebugFile(info.fileName())) { QuasarAppUtils::Params::log("Skip debug library " + info.absoluteFilePath()); @@ -218,7 +218,7 @@ bool QMLQt6::scan(QStringList &res, const QString& _qmlProjectDir) { return false; } - for (const auto &import : qAsConst(_imports)) { + for (const auto &import : std::as_const(_imports)) { res.push_back(getPathFromImport(import)); } diff --git a/submodules/QuasarAppLib b/submodules/QuasarAppLib index a23bbe92..3b797f9a 160000 --- a/submodules/QuasarAppLib +++ b/submodules/QuasarAppLib @@ -1 +1 @@ -Subproject commit a23bbe92689b472c69b73d0e49646de991a0390f +Subproject commit 3b797f9a7883bec4083dc8abf6159b0146f313d3 diff --git a/testcases/quicknanobrowser/main.cpp b/testcases/quicknanobrowser/main.cpp index f21b0362..d3f3bbb0 100644 --- a/testcases/quicknanobrowser/main.cpp +++ b/testcases/quicknanobrowser/main.cpp @@ -60,7 +60,7 @@ static QUrl startupUrl() QUrl ret; QStringList args(qApp->arguments()); args.takeFirst(); - for (const QString &arg : qAsConst(args)) { + for (const QString &arg : std::as_const(args)) { if (arg.startsWith(QLatin1Char('-'))) continue; ret = Utils::fromUserInput(arg); diff --git a/tests/modules/modulesqt6_6.cpp b/tests/modules/modulesqt6_6.cpp new file mode 100644 index 00000000..1ad399ad --- /dev/null +++ b/tests/modules/modulesqt6_6.cpp @@ -0,0 +1,92 @@ +/* + * Copyright (C) 2023-2023 QuasarApp. + * Distributed under the lgplv3 software license, see the accompanying + * Everyone is permitted to copy and distribute verbatim copies + * of this license document, but changing it is not allowed. + */ + +#include "modulesqt6_6.h" + +ModulesQt6_6::ModulesQt6_6() +{ + +} + +QSet ModulesQt6_6::qmlLibs(const QString &distDir) const { + TestUtils utils; + auto Tree = ModulesQt6_5::qmlLibs(distDir); + +#ifdef Q_OS_WIN + +#else + +#endif + + return Tree; +} + +QSet ModulesQt6_6::qmlVirtualKeyBoadrLibs(const QString &distDir) const { + + TestUtils utils; + + auto Tree = ModulesQt6_5::qmlVirtualKeyBoadrLibs(distDir); + return Tree; +} + +QSet ModulesQt6_6::qtWebEngine(const QString &distDir) const +{ + TestUtils utils; + + auto Tree = ModulesQt6_5::qtWebEngine(distDir); + +#ifdef Q_OS_WIN + Tree += utils.createTree( + { + "./" + distDir + "/resources/v8_context_snapshot.bin" + + } + ); +#else + Tree += utils.createTree( + { + "./" + distDir + "/resources/v8_context_snapshot.bin", + "./" + distDir + "/lib/libQt6WebChannelQuick.so", + "./" + distDir + "/qml/QtWebChannel/libwebchannelplugin.so", + "./" + distDir + "/qml/QtWebChannel/libwebchannelquickplugin.so", + + } + ); +#endif + + return Tree; +} + +QSet ModulesQt6_6::qtLibs(const QString &distDir) const { + auto Tree = ModulesQt6_5::qtLibs(distDir); + TestUtils utils; + + + return Tree; +} + +QSet ModulesQt6_6::qtWebEngineWidgets(const QString &distDir) const +{ + TestUtils utils; + + auto Tree = ModulesQt6_5::qtWebEngineWidgets(distDir); +#ifdef Q_OS_WIN + Tree += utils.createTree( + { + "./" + distDir + "/resources/v8_context_snapshot.bin" + + } + ); +#else + Tree += utils.createTree( + { + "./" + distDir + "/resources/v8_context_snapshot.bin" + } + ); +#endif + return Tree; +} diff --git a/tests/modules/modulesqt6_6.h b/tests/modules/modulesqt6_6.h new file mode 100644 index 00000000..5cfe6568 --- /dev/null +++ b/tests/modules/modulesqt6_6.h @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2023-2023 QuasarApp. + * Distributed under the lgplv3 software license, see the accompanying + * Everyone is permitted to copy and distribute verbatim copies + * of this license document, but changing it is not allowed. + */ + +#ifndef MODULESQT6_6_H +#define MODULESQT6_6_H + +#include "modulesqt6_5.h" + +class ModulesQt6_6: public ModulesQt6_5 +{ +public: + ModulesQt6_6(); + QSet qmlLibs(const QString &distDir = DISTRO_DIR) const override; + QSet qmlVirtualKeyBoadrLibs(const QString &distDir = DISTRO_DIR) const override; + QSet qtWebEngine(const QString &distDir = DISTRO_DIR) const override; + QSet qtWebEngineWidgets(const QString &distDir = DISTRO_DIR) const override; + QSet qtLibs(const QString &distDir = DISTRO_DIR) const override; +}; + +#endif // MODULESQT6_5_H diff --git a/tests/tstMain.cpp b/tests/tstMain.cpp index 60fbc15a..4c8fd170 100644 --- a/tests/tstMain.cpp +++ b/tests/tstMain.cpp @@ -78,7 +78,7 @@ // Check exampletests #define TestCase(name, testClass) \ void name() { \ - initTest(new testClass()); \ + initTest(new testClass); \ } /** @@ -159,8 +159,8 @@ private slots: TestCase(ziparrchivetest, ZIPArchiveTest ) TestCase(zipmultitest, ZIPMultiTest ) TestCase(ziptest, ZIPTest ) - TestCase(systemLibTest, SystemLibTest) TestCase(qmlfiledialogtest, QmlFileDialogTest) + TestCase(systemLibTest, SystemLibTest) #endif @@ -314,11 +314,12 @@ void tstMain::initTest(Test *test) { delete e; } - delete test; _app->exit(0); }); _app->exec(); + + delete test; } QTEST_APPLESS_MAIN(tstMain) diff --git a/tests/units/linux/checkqttest.cpp b/tests/units/linux/checkqttest.cpp index dbce3f2d..59860634 100644 --- a/tests/units/linux/checkqttest.cpp +++ b/tests/units/linux/checkqttest.cpp @@ -47,7 +47,7 @@ void CheckQtTest::test() { }; - for (const auto &i: qAsConst(cases)) { + for (const auto &i: std::as_const(cases)) { QVERIFY(DeployCore::isQtLib(i.first) == i.second); } delete deployer; @@ -109,7 +109,7 @@ void CheckQtTest::test() { }; - for (const auto &i: qAsConst(cases)) { + for (const auto &i: std::as_const(cases)) { auto dexription = QString("The isQtLib(%0) function should be return %1").arg( i.first).arg(i.second); QVERIFY2(DeployCore::isQtLib(i.first) == i.second, dexription.toLatin1().data()); diff --git a/tests/units/linux/distrostructtest.cpp b/tests/units/linux/distrostructtest.cpp index ec6e05d7..a9fe0f4b 100644 --- a/tests/units/linux/distrostructtest.cpp +++ b/tests/units/linux/distrostructtest.cpp @@ -41,7 +41,7 @@ void DistroStructTest::test() { {"\\\\res\\\\\\type\\\\\\\\\\","/../../"}, }; - for (const auto &i: qAsConst(cases)) { + for (const auto &i: std::as_const(cases)) { if (distro.getRelativePath(i.first) != i.second) QVERIFY(false); } diff --git a/tests/units/linux/extrapluginstest.cpp b/tests/units/linux/extrapluginstest.cpp index a827310d..11779f3b 100644 --- a/tests/units/linux/extrapluginstest.cpp +++ b/tests/units/linux/extrapluginstest.cpp @@ -36,6 +36,11 @@ void ExtraPluginTest::test() { }); + +#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0) + pluginTree += utils.createTree({"./" + DISTRO_DIR + "/plugins/sqldrivers/libqsqlmimer.so"}); +#endif + #else QString bin = TestBinDir + "QtWidgetsProject.exe"; QString qmake = TestQtDir + "bin/qmake.exe"; @@ -50,6 +55,10 @@ void ExtraPluginTest::test() { "./" + DISTRO_DIR + "/libpq.dll", }); + +#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0) + pluginTree.insert("./" + DISTRO_DIR + "/plugins/sqldrivers/qsqlmimer.dll"); +#endif #endif auto comapareTree = TestModule.qtLibs(); diff --git a/tests/units/linux/iconstest.cpp b/tests/units/linux/iconstest.cpp index 88798d05..b6de3065 100644 --- a/tests/units/linux/iconstest.cpp +++ b/tests/units/linux/iconstest.cpp @@ -76,7 +76,7 @@ void IconsTest::test() { "-icon", ":/testResurces/testRes/TestIcon.png", }); - for (const auto &target : qAsConst(binMulti)) { + for (const auto &target : std::as_const(binMulti)) { QFileInfo tarInfo(target); targetsMap = deploy->_config.getTargetsListByFilter(tarInfo.baseName()); diff --git a/tests/units/linux/qmlextracttest.cpp b/tests/units/linux/qmlextracttest.cpp index e75f4549..f667a784 100644 --- a/tests/units/linux/qmlextracttest.cpp +++ b/tests/units/linux/qmlextracttest.cpp @@ -26,7 +26,7 @@ void QMLExtractTest::test() { QMLQt5 scaner("./"); - for (const auto &file : qAsConst(qmlFiles)) { + for (const auto &file : std::as_const(qmlFiles)) { auto fileImports = scaner.extractImportsFromFile(file); diff --git a/tests/units/linux/qmlfiledialogtest.cpp b/tests/units/linux/qmlfiledialogtest.cpp index de4cf0ff..b134f5b6 100644 --- a/tests/units/linux/qmlfiledialogtest.cpp +++ b/tests/units/linux/qmlfiledialogtest.cpp @@ -36,10 +36,25 @@ void QmlFileDialogTest::test() { "./" + DISTRO_DIR + "/qml/QtCore/qmldir", "./" + DISTRO_DIR + "/qml/QtQuick/Dialogs/libqtquickdialogsplugin.so", "./" + DISTRO_DIR + "/qml/QtQuick/Dialogs/plugins.qmltypes", - "./" + DISTRO_DIR + "/qml/QtQuick/Dialogs/qmldir" + "./" + DISTRO_DIR + "/qml/QtQuick/Dialogs/qmldir", } ); +#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0) + compareTree += utils.createTree( + { + "./" + DISTRO_DIR + "/lib/libQt6QuickLayouts.so", + "./" + DISTRO_DIR + "/qml/QtQuick/Dialogs/quickimpl/libqtquickdialogs2quickimplplugin.so", + "./" + DISTRO_DIR + "/qml/QtQuick/Dialogs/quickimpl/plugins.qmltypes", + "./" + DISTRO_DIR + "/qml/QtQuick/Dialogs/quickimpl/qmldir", + "./" + DISTRO_DIR + "/qml/QtQuick/Layouts/libqquicklayoutsplugin.so", + "./" + DISTRO_DIR + "/qml/QtQuick/Layouts/plugins.qmltypes", + "./" + DISTRO_DIR + "/qml/QtQuick/Layouts/qmldir" + + } + ); +#endif + auto bin = TestBinDir + "QMLFileDialog"; runTestParams({"-bin", bin, "clear" , diff --git a/tests/units/linux/qmlscanertest.cpp b/tests/units/linux/qmlscanertest.cpp index ec127282..cea2b247 100644 --- a/tests/units/linux/qmlscanertest.cpp +++ b/tests/units/linux/qmlscanertest.cpp @@ -33,7 +33,7 @@ void QmlScanerTest::test() { QVERIFY(results.size() == imports.size()); - for (const auto &import: qAsConst(imports)) { + for (const auto &import: std::as_const(imports)) { auto path = scaner6.getPathFromImport(import); QVERIFY(results.contains(path)); } @@ -42,7 +42,7 @@ void QmlScanerTest::test() { QVERIFY(results.size() == imports.size()); - for (const auto & import: qAsConst(imports)) { + for (const auto & import: std::as_const(imports)) { auto path = scaner6.getPathFromImport(import); QVERIFY(results.contains(path)); } @@ -62,7 +62,7 @@ void QmlScanerTest::test() { QVERIFY(results.size() == imports.size()); - for (const auto &import: qAsConst(imports)) { + for (const auto &import: std::as_const(imports)) { auto path = scaner6.getPathFromImport(import); QVERIFY(results.contains(path)); } diff --git a/tests/units/linux/releativelinktest.cpp b/tests/units/linux/releativelinktest.cpp index 86674942..03339158 100644 --- a/tests/units/linux/releativelinktest.cpp +++ b/tests/units/linux/releativelinktest.cpp @@ -35,7 +35,7 @@ void ReleativeLinkTest::test() { }; - for (const auto &i: qAsConst(cases)) { + for (const auto &i: std::as_const(cases)) { if (PathUtils::getRelativeLink(i[0], i[1]) != i[2]) QVERIFY(false); } diff --git a/tests/units/modules.h b/tests/units/modules.h index d0eabc37..05919e1e 100644 --- a/tests/units/modules.h +++ b/tests/units/modules.h @@ -11,7 +11,10 @@ #include #include -#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) +#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0) + #include "modulesqt6_6.h" + class Modules: public ModulesQt6_6 +#elif QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) #include "modulesqt6_5.h" class Modules: public ModulesQt6_5 diff --git a/tests/units/testbase.cpp b/tests/units/testbase.cpp index bf18a5b2..25443b07 100644 --- a/tests/units/testbase.cpp +++ b/tests/units/testbase.cpp @@ -109,7 +109,7 @@ void TestBase::checkResults(const QSet &tree, bool noWarnings, bool onl } QJsonObject obj; - for (const auto &i : qAsConst(resultTree)) { + for (const auto &i : std::as_const(resultTree)) { obj[i]; } diff --git a/tests/units/testutils.cpp b/tests/units/testutils.cpp index 1350753c..f6e82310 100644 --- a/tests/units/testutils.cpp +++ b/tests/units/testutils.cpp @@ -35,7 +35,7 @@ QSet TestUtils::getTree(const QString &path, int limit, int depch) { QDir dir(info.absoluteFilePath()); auto list = dir.entryInfoList(QDir::AllEntries | QDir::NoDotAndDotDot); - for (const auto &i: qAsConst(list)) { + for (const auto &i: std::as_const(list)) { result.unite(getTree(i.absoluteFilePath(), limit, depch + 1)); } @@ -62,7 +62,7 @@ QSet TestUtils::getFilesSet(const QString &path, int limit, int depch) QDir dir(info.absoluteFilePath()); auto list = dir.entryInfoList(QDir::AllEntries | QDir::NoDotAndDotDot); - for (const auto &i: qAsConst(list)) { + for (const auto &i: std::as_const(list)) { result.unite(getFilesSet(i.absoluteFilePath(), limit, depch + 1)); } @@ -109,11 +109,11 @@ QHash TestUtils::compareTree(const QSet &leftTree, const auto valuel = leftTree - rightTree; auto valuer = rightTree - leftTree; - for(auto &i :qAsConst(valuel)) { + for(auto &i :std::as_const(valuel)) { result.insert(i, 1); } - for(auto &i :qAsConst(valuer)) { + for(auto &i :std::as_const(valuer)) { result.insert(i, -1); }