diff options
24 files changed, 81 insertions, 38 deletions
diff --git a/examples/collidingmice/main.cpp b/examples/collidingmice/main.cpp index ffddf4c81..2d0514427 100644 --- a/examples/collidingmice/main.cpp +++ b/examples/collidingmice/main.cpp @@ -64,7 +64,6 @@ static const int MouseCount = 7; int main(int argc, char **argv) { QApplication app(argc, argv); - qsrand(QTime(0,0,0).secsTo(QTime::currentTime())); //! [0] //! [1] diff --git a/examples/collidingmice/mouse.cpp b/examples/collidingmice/mouse.cpp index 7075ada38..bbc718649 100644 --- a/examples/collidingmice/mouse.cpp +++ b/examples/collidingmice/mouse.cpp @@ -71,9 +71,9 @@ static qreal normalizeAngle(qreal angle) //! [0] Mouse::Mouse() : angle(0), speed(0), mouseEyeDirection(0), - color(qrand() % 256, qrand() % 256, qrand() % 256) + color(m_rand.generate() % 256, m_rand.generate() % 256, m_rand.generate() % 256) { - setRotation(qrand() % (360 * 16)); + setRotation(m_rand.generate() % (360 * 16)); } //! [0] @@ -189,16 +189,16 @@ void Mouse::advance(int step) // Add some random movement //! [10] - if (dangerMice.size() > 1 && (qrand() % 10) == 0) { - if (qrand() % 1) - angle += (qrand() % 100) / 500.0; + if (dangerMice.size() > 1 && (m_rand.generate() % 10) == 0) { + if (m_rand.generate() % 1) + angle += (m_rand.generate() % 100) / 500.0; else - angle -= (qrand() % 100) / 500.0; + angle -= (m_rand.generate() % 100) / 500.0; } //! [10] //! [11] - speed += (-50 + qrand() % 100) / 100.0; + speed += (-50 + m_rand.generate() % 100) / 100.0; qreal dx = ::sin(angle) * 10; mouseEyeDirection = (qAbs(dx / 5) < 1) ? 0 : dx / 5; diff --git a/examples/collidingmice/mouse.h b/examples/collidingmice/mouse.h index a98618ea5..23b9faad5 100644 --- a/examples/collidingmice/mouse.h +++ b/examples/collidingmice/mouse.h @@ -52,6 +52,7 @@ #define MOUSE_H #include <QGraphicsItem> +#include <QRandomGenerator> //! [0] class Mouse : public QGraphicsItem @@ -68,6 +69,7 @@ protected: void advance(int step) override; private: + QRandomGenerator m_rand = QRandomGenerator::securelySeeded(); qreal angle; qreal speed; qreal mouseEyeDirection; diff --git a/src/app/qbs-create-project/create-project-main.cpp b/src/app/qbs-create-project/create-project-main.cpp index f26df3dbf..bb5d1a6bc 100644 --- a/src/app/qbs-create-project/create-project-main.cpp +++ b/src/app/qbs-create-project/create-project-main.cpp @@ -41,6 +41,7 @@ #include <logging/translator.h> #include <tools/error.h> +#include <tools/qttools.h> #include <QtCore/qcommandlineoption.h> #include <QtCore/qcommandlineparser.h> @@ -79,9 +80,9 @@ int main(int argc, char *argv[]) const ProjectStructure projectStructure = parser.isSet(flatOpt) ? ProjectStructure::Flat : ProjectStructure::Composite; const QStringList whiteList = parser.value(whiteListOpt).split(QLatin1Char(','), - QString::SkipEmptyParts); + QBS_SKIP_EMPTY_PARTS); const QStringList blackList = parser.value(blackListOpt).split(QLatin1Char(','), - QString::SkipEmptyParts); + QBS_SKIP_EMPTY_PARTS); try { ProjectCreator().run(QDir::currentPath(), projectStructure, whiteList, blackList); } catch (const ErrorInfo &e) { diff --git a/src/app/qbs-setup-qt/main.cpp b/src/app/qbs-setup-qt/main.cpp index 94185c4d7..bef95eee2 100644 --- a/src/app/qbs-setup-qt/main.cpp +++ b/src/app/qbs-setup-qt/main.cpp @@ -41,6 +41,7 @@ #include "commandlineparser.h" #include <logging/translator.h> +#include <tools/qttools.h> #include <tools/settings.h> #include <QtCore/qcoreapplication.h> @@ -81,7 +82,7 @@ int main(int argc, char *argv[]) QString profileName = QLatin1String("qt-") + qtEnvironment.qtVersion.toString(); if (SetupQt::checkIfMoreThanOneQtWithTheSameVersion(qtEnvironment.qtVersion, qtEnvironments)) { QStringList prefixPathParts = QFileInfo(qtEnvironment.qmakeFilePath).path() - .split(QLatin1Char('/'), QString::SkipEmptyParts); + .split(QLatin1Char('/'), QBS_SKIP_EMPTY_PARTS); if (!prefixPathParts.empty()) profileName += QLatin1String("-") + prefixPathParts.last(); } diff --git a/src/app/qbs-setup-toolchains/xcodeprobe.cpp b/src/app/qbs-setup-toolchains/xcodeprobe.cpp index 97b043f92..67dafa91c 100644 --- a/src/app/qbs-setup-toolchains/xcodeprobe.cpp +++ b/src/app/qbs-setup-toolchains/xcodeprobe.cpp @@ -45,6 +45,7 @@ #include <logging/translator.h> #include <tools/architectures.h> #include <tools/profile.h> +#include <tools/qttools.h> #include <tools/settings.h> #include <QtCore/qstringlist.h> @@ -160,7 +161,7 @@ void XcodeProbe::detectDeveloperPaths() qbsInfo() << Tr::tr("Could not detect additional Xcode installations with /usr/bin/mdfind"); } else { const auto paths = QString::fromLocal8Bit(launchServices.readAllStandardOutput()) - .split(QLatin1Char('\n'), QString::SkipEmptyParts); + .split(QLatin1Char('\n'), QBS_SKIP_EMPTY_PARTS); for (const QString &path : paths) addDeveloperPath(path + QStringLiteral("/Contents/Developer")); } diff --git a/src/lib/corelib/api/runenvironment.cpp b/src/lib/corelib/api/runenvironment.cpp index 94a74dac2..8cea759a8 100644 --- a/src/lib/corelib/api/runenvironment.cpp +++ b/src/lib/corelib/api/runenvironment.cpp @@ -228,7 +228,7 @@ int RunEnvironment::doRunShell() static QString findExecutable(const QStringList &fileNames) { const QStringList path = QString::fromLocal8Bit(qgetenv("PATH")) - .split(HostOsInfo::pathListSeparator(), QString::SkipEmptyParts); + .split(HostOsInfo::pathListSeparator(), QBS_SKIP_EMPTY_PARTS); for (const QString &fileName : fileNames) { const QString exeFileName = HostOsInfo::appendExecutableSuffix(fileName); diff --git a/src/lib/corelib/buildgraph/jscommandexecutor.cpp b/src/lib/corelib/buildgraph/jscommandexecutor.cpp index aa72a7b5c..b7270c9a5 100644 --- a/src/lib/corelib/buildgraph/jscommandexecutor.cpp +++ b/src/lib/corelib/buildgraph/jscommandexecutor.cpp @@ -53,6 +53,7 @@ #include <tools/codelocation.h> #include <tools/error.h> #include <tools/qbsassert.h> +#include <tools/qttools.h> #include <QtCore/qeventloop.h> #include <QtCore/qpointer.h> @@ -153,8 +154,8 @@ private: scriptEngine->setGlobalObject(scope.prototype()); transformer->propertiesRequestedInCommands += scriptEngine->propertiesRequestedInScript(); - transformer->propertiesRequestedFromArtifactInCommands - .unite(scriptEngine->propertiesRequestedFromArtifact()); + unite(transformer->propertiesRequestedFromArtifactInCommands, + scriptEngine->propertiesRequestedFromArtifact()); const std::vector<QString> &importFilesUsedInCommand = scriptEngine->importedFilesUsedInScript(); transformer->importedFilesUsedInCommands.insert( diff --git a/src/lib/corelib/buildgraph/processcommandexecutor.cpp b/src/lib/corelib/buildgraph/processcommandexecutor.cpp index b54e05969..893502726 100644 --- a/src/lib/corelib/buildgraph/processcommandexecutor.cpp +++ b/src/lib/corelib/buildgraph/processcommandexecutor.cpp @@ -286,7 +286,7 @@ void ProcessCommandExecutor::getProcessOutput(bool stdOut, ProcessResult &result } else { if (!contentString.isEmpty() && contentString.endsWith(QLatin1Char('\n'))) contentString.chop(1); - *target = contentString.split(QLatin1Char('\n'), QString::SkipEmptyParts); + *target = contentString.split(QLatin1Char('\n'), QBS_SKIP_EMPTY_PARTS); } } diff --git a/src/lib/corelib/language/language.cpp b/src/lib/corelib/language/language.cpp index 3b3e7401e..7b21bc12a 100644 --- a/src/lib/corelib/language/language.cpp +++ b/src/lib/corelib/language/language.cpp @@ -726,7 +726,7 @@ Set<QString> SourceWildCards::expandPatterns(const GroupConstPtr &group, for (QString pattern : patterns) { pattern.prepend(expandedPrefix); pattern.replace(QLatin1Char('\\'), QLatin1Char('/')); - QStringList parts = pattern.split(QLatin1Char('/'), QString::SkipEmptyParts); + QStringList parts = pattern.split(QLatin1Char('/'), QBS_SKIP_EMPTY_PARTS); if (FileInfo::isAbsolute(pattern)) { QString rootDir; if (HostOsInfo::isWindowsHost() && pattern.at(0) != QLatin1Char('/')) { diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp index 57c94dcce..b310c3eaf 100644 --- a/src/lib/corelib/language/moduleloader.cpp +++ b/src/lib/corelib/language/moduleloader.cpp @@ -884,13 +884,14 @@ ModuleLoader::MultiplexInfo ModuleLoader::extractMultiplexInfo(Item *productItem MultiplexRow mprow; mprow.resize(arrlen); - Set<QVariant> entriesForKey; + QVariantList entriesForKey; for (quint32 i = 0; i < arrlen; ++i) { const QVariant value = arr.property(i).toVariant(); - if (!entriesForKey.insert(value).second) { + if (entriesForKey.contains(value)) { throw ErrorInfo(Tr::tr("Duplicate entry '%1' in qbs.%2.") .arg(value.toString(), key), productItem->location()); } + entriesForKey << value; mprow[i] = VariantValue::create(value); } multiplexInfo.table = combine(multiplexInfo.table, mprow); diff --git a/src/lib/corelib/tools/executablefinder.cpp b/src/lib/corelib/tools/executablefinder.cpp index 0dc06dd86..a02fbdc98 100644 --- a/src/lib/corelib/tools/executablefinder.cpp +++ b/src/lib/corelib/tools/executablefinder.cpp @@ -120,7 +120,7 @@ QString ExecutableFinder::findInPath(const QString &filePath, const QString &wor fullProgramPath = filePath; qCDebug(lcExec) << "looking for executable in PATH" << fullProgramPath; QStringList pathEnv = m_environment.value(StringConstants::pathEnvVar()) - .split(HostOsInfo::pathListSeparator(), QString::SkipEmptyParts); + .split(HostOsInfo::pathListSeparator(), QBS_SKIP_EMPTY_PARTS); if (HostOsInfo::isWindowsHost()) pathEnv.prepend(StringConstants::dot()); for (QString directory : qAsConst(pathEnv)) { diff --git a/src/lib/corelib/tools/launchersocket.cpp b/src/lib/corelib/tools/launchersocket.cpp index 4373b10b8..c7cfb27cf 100644 --- a/src/lib/corelib/tools/launchersocket.cpp +++ b/src/lib/corelib/tools/launchersocket.cpp @@ -82,7 +82,11 @@ void LauncherSocket::setSocket(QLocalSocket *socket) m_socket = socket; m_packetParser.setDevice(m_socket); connect(m_socket, +#if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0)) static_cast<void(QLocalSocket::*)(QLocalSocket::LocalSocketError)>(&QLocalSocket::error), +#else + &QLocalSocket::errorOccurred, +#endif this, &LauncherSocket::handleSocketError); connect(m_socket, &QLocalSocket::readyRead, this, &LauncherSocket::handleSocketDataAvailable); diff --git a/src/lib/corelib/tools/qttools.h b/src/lib/corelib/tools/qttools.h index 04fd7d95e..2d4a38544 100644 --- a/src/lib/corelib/tools/qttools.h +++ b/src/lib/corelib/tools/qttools.h @@ -50,6 +50,12 @@ QT_BEGIN_NAMESPACE class QProcessEnvironment; QT_END_NAMESPACE +#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0)) +#define QBS_SKIP_EMPTY_PARTS QString::SkipEmptyParts +#else +#define QBS_SKIP_EMPTY_PARTS Qt::SkipEmptyParts +#endif + namespace std { #if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0)) template<> struct hash<QString> { @@ -101,7 +107,17 @@ QList<T> toList(const QSet<T> &set) #endif } -} // namespace qbs +template<typename K, typename V> +QHash<K, V> &unite(QHash<K, V> &h, const QHash<K, V> &other) +{ +#if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0)) + return h.unite(other); +#else + h.insert(other); + return h; +#endif +} +} // namespace qbs #endif // QBSQTTOOLS_H diff --git a/src/lib/corelib/tools/settingsmodel.cpp b/src/lib/corelib/tools/settingsmodel.cpp index 7283e959c..7192ef45f 100644 --- a/src/lib/corelib/tools/settingsmodel.cpp +++ b/src/lib/corelib/tools/settingsmodel.cpp @@ -332,7 +332,7 @@ void SettingsModel::SettingsModelPrivate::readSettings() addNodeFromSettings(&rootNode, topLevelKey); for (QVariantMap::ConstIterator it = additionalProperties.constBegin(); it != additionalProperties.constEnd(); ++it) { - const QStringList nameAsList = it.key().split(QLatin1Char('.'), QString::SkipEmptyParts); + const QStringList nameAsList = it.key().split(QLatin1Char('.'), QBS_SKIP_EMPTY_PARTS); addNode(&rootNode, nameAsList.front(), nameAsList.mid(1), it.value()); } dirty = false; diff --git a/src/lib/corelib/tools/shellutils.cpp b/src/lib/corelib/tools/shellutils.cpp index b60881012..33ab2c76c 100644 --- a/src/lib/corelib/tools/shellutils.cpp +++ b/src/lib/corelib/tools/shellutils.cpp @@ -39,7 +39,10 @@ ****************************************************************************/ #include "shellutils.h" + #include "pathutils.h" +#include "qttools.h" + #include <QtCore/qfile.h> #include <QtCore/qregexp.h> #include <QtCore/qtextstream.h> @@ -54,7 +57,7 @@ QString shellInterpreter(const QString &filePath) { const QString shebang = ts.readLine(); if (shebang.startsWith(QLatin1String("#!"))) { return (shebang.mid(2).split(QRegExp(QStringLiteral("\\s")), - QString::SkipEmptyParts) << QString()).front(); + QBS_SKIP_EMPTY_PARTS) << QString()).front(); } } diff --git a/src/libexec/qbs_processlauncher/launchersockethandler.cpp b/src/libexec/qbs_processlauncher/launchersockethandler.cpp index dac1b0b2e..637362b88 100644 --- a/src/libexec/qbs_processlauncher/launchersockethandler.cpp +++ b/src/libexec/qbs_processlauncher/launchersockethandler.cpp @@ -122,7 +122,11 @@ void LauncherSocketHandler::start() this, &LauncherSocketHandler::handleSocketClosed); connect(m_socket, &QLocalSocket::readyRead, this, &LauncherSocketHandler::handleSocketData); connect(m_socket, +#if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0)) static_cast<void(QLocalSocket::*)(QLocalSocket::LocalSocketError)>(&QLocalSocket::error), +#else + &QLocalSocket::errorOccurred, +#endif this, &LauncherSocketHandler::handleSocketError); m_socket->connectToServer(m_serverPath); } diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index 99c6e3862..b0d9c2976 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -298,7 +298,7 @@ void TestBlackbox::textTemplate() static QStringList sortedFileList(const QByteArray &ba) { - auto list = QString::fromUtf8(ba).split(QRegExp("[\r\n]"), QString::SkipEmptyParts); + auto list = QString::fromUtf8(ba).split(QRegExp("[\r\n]"), QBS_SKIP_EMPTY_PARTS); std::sort(list.begin(), list.end()); return list; } @@ -647,7 +647,7 @@ void TestBlackbox::buildDirectories() QDir::setCurrent(projectDir); QCOMPARE(runQbs(), 0); const QStringList outputLines - = QString::fromLocal8Bit(m_qbsStdout.trimmed()).split('\n', QString::SkipEmptyParts); + = QString::fromLocal8Bit(m_qbsStdout.trimmed()).split('\n', QBS_SKIP_EMPTY_PARTS); QVERIFY2(outputLines.contains(projectDir + '/' + relativeProductBuildDir("p1")), m_qbsStdout.constData()); QVERIFY2(outputLines.contains(projectDir + '/' + relativeProductBuildDir("p2")), @@ -3619,7 +3619,7 @@ void TestBlackbox::emptyProfile() QDir::toNativeSeparators( buildProfile.value(QStringLiteral("cpp.toolchainInstallPath")).toString()); auto paths = params.environment.value(QStringLiteral("PATH")) - .split(HostOsInfo::pathListSeparator(), QString::SkipEmptyParts); + .split(HostOsInfo::pathListSeparator(), QBS_SKIP_EMPTY_PARTS); if (!tcPath.isEmpty() && !paths.contains(tcPath)) { paths.prepend(tcPath); params.environment.insert( @@ -4749,7 +4749,7 @@ void TestBlackbox::lexyacc() env.insert("PATH", dir); p.setProcessEnvironment(env); } - p.start(parserBinary); + p.start(parserBinary, QStringList()); QVERIFY2(p.waitForStarted(), qPrintable(p.errorString())); p.write("a && b || c && !d"); p.closeWriteChannel(); @@ -7004,7 +7004,7 @@ static bool haveMakeNsis() << QStringLiteral("HKEY_LOCAL_MACHINE\\SOFTWARE\\NSIS"); QStringList paths = QProcessEnvironment::systemEnvironment().value("PATH") - .split(HostOsInfo::pathListSeparator(), QString::SkipEmptyParts); + .split(HostOsInfo::pathListSeparator(), QBS_SKIP_EMPTY_PARTS); for (const QString &key : qAsConst(regKeys)) { QSettings settings(key, QSettings::NativeFormat); @@ -7251,7 +7251,7 @@ static bool haveWiX(const Profile &profile) << QStringLiteral("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows Installer XML\\"); QStringList paths = QProcessEnvironment::systemEnvironment().value("PATH") - .split(HostOsInfo::pathListSeparator(), QString::SkipEmptyParts); + .split(HostOsInfo::pathListSeparator(), QBS_SKIP_EMPTY_PARTS); for (const QString &key : qAsConst(regKeys)) { const QStringList versions = QSettings(key, QSettings::NativeFormat).childGroups(); @@ -7451,7 +7451,7 @@ static bool haveInnoSetup(const Profile &profile) << QStringLiteral("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Inno Setup 5_is1"); QStringList paths = QProcessEnvironment::systemEnvironment().value("PATH") - .split(HostOsInfo::pathListSeparator(), QString::SkipEmptyParts); + .split(HostOsInfo::pathListSeparator(), QBS_SKIP_EMPTY_PARTS); for (const QString &key : qAsConst(regKeys)) { QSettings settings(key, QSettings::NativeFormat); @@ -7642,7 +7642,7 @@ void TestBlackbox::makefileGenerator() QVERIFY(QFile::exists(relativeExecutableFilePath("the app"))); QVERIFY(!QFile::exists(relativeBuildGraphFilePath())); QProcess app; - app.start('"' + customInstallRoot + "/usr/local/bin/the app\""); + app.start(customInstallRoot + "/usr/local/bin/the app", QStringList()); QVERIFY(waitForProcessSuccess(app)); const QByteArray appStdout = app.readAllStandardOutput(); QVERIFY2(appStdout.contains("Hello, World!"), appStdout.constData()); diff --git a/tests/auto/blackbox/tst_blackboxapple.cpp b/tests/auto/blackbox/tst_blackboxapple.cpp index 3623dc51b..87bea9ae5 100644 --- a/tests/auto/blackbox/tst_blackboxapple.cpp +++ b/tests/auto/blackbox/tst_blackboxapple.cpp @@ -31,6 +31,7 @@ #include "../shared.h" #include <tools/hostosinfo.h> #include <tools/profile.h> +#include <tools/qttools.h> #include <QtCore/qjsondocument.h> #include <QtCore/qjsonobject.h> @@ -913,8 +914,10 @@ void TestBlackboxApple::xcode() xcodebuildShowSdks.start("xcrun", QStringList() << "xcodebuild" << "-showsdks"); QVERIFY2(xcodebuildShowSdks.waitForStarted(), qPrintable(xcodebuildShowSdks.errorString())); QVERIFY2(xcodebuildShowSdks.waitForFinished(), qPrintable(xcodebuildShowSdks.errorString())); - QVERIFY2(xcodebuildShowSdks.exitCode() == 0, qPrintable(xcodebuildShowSdks.readAllStandardError().constData())); - const auto lines = QString::fromLocal8Bit(xcodebuildShowSdks.readAllStandardOutput().trimmed()).split('\n', QString::SkipEmptyParts); + QVERIFY2(xcodebuildShowSdks.exitCode() == 0, + qPrintable(xcodebuildShowSdks.readAllStandardError().constData())); + const auto lines = QString::fromLocal8Bit(xcodebuildShowSdks.readAllStandardOutput().trimmed()) + .split('\n', QBS_SKIP_EMPTY_PARTS); for (const QString &line : lines) { static const std::regex regexp("^.+\\s+\\-sdk\\s+([a-z]+)([0-9]+\\.[0-9]+)$"); const auto ln = line.toStdString(); diff --git a/tests/auto/blackbox/tst_blackboxbase.cpp b/tests/auto/blackbox/tst_blackboxbase.cpp index a99b037c9..0e383c831 100644 --- a/tests/auto/blackbox/tst_blackboxbase.cpp +++ b/tests/auto/blackbox/tst_blackboxbase.cpp @@ -217,7 +217,7 @@ void TestBlackboxBase::validateTestProfile() QString TestBlackboxBase::findExecutable(const QStringList &fileNames) { const QStringList path = QString::fromLocal8Bit(qgetenv("PATH")) - .split(HostOsInfo::pathListSeparator(), QString::SkipEmptyParts); + .split(HostOsInfo::pathListSeparator(), QBS_SKIP_EMPTY_PARTS); for (const QString &fileName : fileNames) { QFileInfo fi(fileName); diff --git a/tests/auto/language/tst_language.cpp b/tests/auto/language/tst_language.cpp index 539ad274d..d34069821 100644 --- a/tests/auto/language/tst_language.cpp +++ b/tests/auto/language/tst_language.cpp @@ -90,7 +90,7 @@ TestLanguage::TestLanguage(ILogSink *logSink, Settings *settings) , m_settings(settings) , m_wildcardsTestDirPath(QDir::tempPath() + QLatin1String("/_wildcards_test_dir_")) { - qsrand(QTime::currentTime().msec()); + m_rand.seed(QTime::currentTime().msec()); qRegisterMetaType<QList<bool> >("QList<bool>"); defaultParameters.setBuildRoot(m_tempDir.path() + "/buildroot"); defaultParameters.setPropertyCheckingMode(ErrorHandlingMode::Strict); @@ -753,7 +753,7 @@ void TestLanguage::environmentVariable() try { // Create new environment: const QString varName = QStringLiteral("PRODUCT_NAME"); - const QString productName = QLatin1String("MyApp") + QString::number(qrand()); + const QString productName = QLatin1String("MyApp") + QString::number(m_rand.generate()); QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); env.insert(varName, productName); diff --git a/tests/auto/language/tst_language.h b/tests/auto/language/tst_language.h index 55591da1f..7e521c05b 100644 --- a/tests/auto/language/tst_language.h +++ b/tests/auto/language/tst_language.h @@ -45,6 +45,7 @@ #include <logging/ilogsink.h> #include <tools/setupprojectparameters.h> +#include <QtCore/qrandom.h> #include <QtCore/qtemporarydir.h> #include <QtTest/qtest.h> @@ -183,6 +184,7 @@ private slots: private: QTemporaryDir m_tempDir; + QRandomGenerator m_rand; }; #endif // TST_LANGUAGE_H diff --git a/tests/benchmarker/commandlineparser.cpp b/tests/benchmarker/commandlineparser.cpp index 9b08bd60d..80241b445 100644 --- a/tests/benchmarker/commandlineparser.cpp +++ b/tests/benchmarker/commandlineparser.cpp @@ -89,7 +89,7 @@ void CommandLineParser::parse() m_testProjectFilePath = parser.value(testProjectOption); m_qbsRepoDirPath = parser.value(qbsRepoOption); const QStringList activitiesList = parser.value(activitiesOption).split(','); - m_activities = 0; + m_activities = Activities(); for (const QString &activityString : activitiesList) { if (activityString == allActivities()) { m_activities = ActivityResolving | ActivityRuleExecution | ActivityNullBuild; diff --git a/tests/fuzzy-test/fuzzytester.cpp b/tests/fuzzy-test/fuzzytester.cpp index 045e46718..2af8c6898 100644 --- a/tests/fuzzy-test/fuzzytester.cpp +++ b/tests/fuzzy-test/fuzzytester.cpp @@ -151,7 +151,12 @@ QStringList FuzzyTester::findAllCommits(const QString &startCommit) QString allCommitsString; runGit(QStringList() << "log" << (startCommit + "~1.." + m_headCommit) << "--format=format:%h", &allCommitsString); - return allCommitsString.simplified().split(QLatin1Char(' '), QString::SkipEmptyParts); + return allCommitsString.simplified().split(QLatin1Char(' '), +#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0)) + QString::SkipEmptyParts); +#else + Qt::SkipEmptyParts); +#endif } QString FuzzyTester::findWorkingStartCommit(const QString &startCommit) |