aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/app/qbs-setup-qt/setupqt.cpp2
-rw-r--r--src/app/qbs-setup-toolchains/msvcprobe.cpp4
-rw-r--r--src/app/qbs/status.cpp2
-rw-r--r--src/lib/corelib/api/project.cpp26
-rw-r--r--src/lib/corelib/api/projectdata.cpp2
-rw-r--r--src/lib/corelib/parser/qmljsparser.cpp3
-rw-r--r--src/lib/corelib/tools/launcherinterface.cpp3
-rw-r--r--src/lib/corelib/tools/version.cpp2
-rw-r--r--src/lib/corelib/tools/visualstudioversioninfo.cpp3
-rw-r--r--src/libexec/qbs_processlauncher/launchersockethandler.cpp2
10 files changed, 28 insertions, 21 deletions
diff --git a/src/app/qbs-setup-qt/setupqt.cpp b/src/app/qbs-setup-qt/setupqt.cpp
index 7905d0823..a3af972bf 100644
--- a/src/app/qbs-setup-qt/setupqt.cpp
+++ b/src/app/qbs-setup-qt/setupqt.cpp
@@ -259,7 +259,7 @@ static Match compatibility(const QtEnvironment &env, const Profile &toolchainPro
const Version compilerVersion = Version::fromString(
toolchainProfile.value(QStringLiteral("cpp.compilerVersion")).toString());
- static const Version vs2017Version{19, 10};
+ static const Version vs2017Version{19, 1};
if (env.msvcVersion >= vs2017Version) {
if (env.msvcVersion.majorVersion() != compilerVersion.majorVersion()
|| compilerVersion < vs2017Version) {
diff --git a/src/app/qbs-setup-toolchains/msvcprobe.cpp b/src/app/qbs-setup-toolchains/msvcprobe.cpp
index 22952716a..faacb4d09 100644
--- a/src/app/qbs-setup-toolchains/msvcprobe.cpp
+++ b/src/app/qbs-setup-toolchains/msvcprobe.cpp
@@ -296,7 +296,7 @@ static std::vector<MSVC> installedMSVCs()
installInfos = installedMSVCsFromRegistry();
for (const MSVCInstallInfo &installInfo : installInfos) {
MSVC msvc;
- msvc.internalVsVersion = Version::fromString(installInfo.version);
+ msvc.internalVsVersion = Version::fromString(installInfo.version, true);
if (!msvc.internalVsVersion.isValid())
continue;
@@ -308,7 +308,7 @@ static std::vector<MSVC> installedMSVCs()
}
msvc.version = QString::number(Internal::VisualStudioVersionInfo(
- Version::fromString(installInfo.version)).marketingVersion());
+ msvc.internalVsVersion).marketingVersion());
if (msvc.version.isEmpty()) {
qbsWarning() << Tr::tr("Unknown MSVC version %1 found.").arg(installInfo.version);
continue;
diff --git a/src/app/qbs/status.cpp b/src/app/qbs/status.cpp
index 79a75c673..3dc540ff5 100644
--- a/src/app/qbs/status.cpp
+++ b/src/app/qbs/status.cpp
@@ -145,7 +145,7 @@ int printStatus(const ProjectData &project)
<< " (" << group.location().filePath() << ":"
<< group.location().line() << ")";
QStringList sourceFiles = group.allFilePaths();
- qSort(sourceFiles);
+ std::sort(sourceFiles.begin(), sourceFiles.end());
for (const QString &sourceFile : qAsConst(sourceFiles)) {
if (!QFileInfo(sourceFile).exists())
missingFiles.push_back(sourceFile);
diff --git a/src/lib/corelib/api/project.cpp b/src/lib/corelib/api/project.cpp
index f7c57611d..3ffd6b2e9 100644
--- a/src/lib/corelib/api/project.cpp
+++ b/src/lib/corelib/api/project.cpp
@@ -284,8 +284,10 @@ GroupData ProjectPrivate::createGroupDataFromGroup(const GroupPtr &resolvedGroup
group.d->sourceArtifactsFromWildcards.push_back(artifact);
}
}
- qSort(group.d->sourceArtifacts);
- qSort(group.d->sourceArtifactsFromWildcards);
+ std::sort(group.d->sourceArtifacts.begin(),
+ group.d->sourceArtifacts.end());
+ std::sort(group.d->sourceArtifactsFromWildcards.begin(),
+ group.d->sourceArtifactsFromWildcards.end());
group.d->properties.d->m_map = resolvedGroup->properties;
group.d->isEnabled = resolvedGroup->enabled;
group.d->isValid = true;
@@ -383,8 +385,9 @@ void ProjectPrivate::addGroup(const ProductData &product, const QString &groupNa
resolvedGroup->properties = resolvedProducts[i]->moduleProperties;
resolvedGroup->overrideTags = false;
resolvedProducts.at(i)->groups << resolvedGroup;
- products.at(i).d->groups << createGroupDataFromGroup(resolvedGroup, resolvedProducts.at(i));
- qSort(products.at(i).d->groups);
+ QList<GroupData> &groupData = products.at(i).d->groups;
+ groupData << createGroupDataFromGroup(resolvedGroup, resolvedProducts.at(i));
+ std::sort(groupData.begin(), groupData.end());
}
}
@@ -559,9 +562,10 @@ void ProjectPrivate::addFiles(const ProductData &product, const GroupData &group
}
for (const GroupData &g : qAsConst(groupContext.groups)) {
g.d->sourceArtifacts << sourceArtifacts;
- qSort(g.d->sourceArtifacts);
+ std::sort(g.d->sourceArtifacts.begin(), g.d->sourceArtifacts.end());
g.d->sourceArtifactsFromWildcards << sourceArtifactsFromWildcards;
- qSort(g.d->sourceArtifactsFromWildcards);
+ std::sort(g.d->sourceArtifactsFromWildcards.begin(),
+ g.d->sourceArtifactsFromWildcards.end());
}
}
@@ -894,9 +898,9 @@ void ProjectPrivate::retrieveProjectData(ProjectData &projectData,
: qAsConst(resolvedProduct->dependencies)) {
product.d->dependencies << resolvedDependentProduct->name;
}
- qSort(product.d->type);
- qSort(product.d->groups);
- qSort(product.d->generatedArtifacts);
+ std::sort(product.d->type.begin(), product.d->type.end());
+ std::sort(product.d->groups.begin(), product.d->groups.end());
+ std::sort(product.d->generatedArtifacts.begin(), product.d->generatedArtifacts.end());
product.d->isValid = true;
projectData.d->products << product;
}
@@ -909,8 +913,8 @@ void ProjectPrivate::retrieveProjectData(ProjectData &projectData,
projectData.d->subProjects << subProject;
}
projectData.d->isValid = true;
- qSort(projectData.d->products);
- qSort(projectData.d->subProjects);
+ std::sort(projectData.d->products.begin(), projectData.d->products.end());
+ std::sort(projectData.d->subProjects.begin(), projectData.d->subProjects.end());
}
} // namespace Internal
diff --git a/src/lib/corelib/api/projectdata.cpp b/src/lib/corelib/api/projectdata.cpp
index 3220b0e37..767bd38c0 100644
--- a/src/lib/corelib/api/projectdata.cpp
+++ b/src/lib/corelib/api/projectdata.cpp
@@ -883,7 +883,7 @@ QVariant PropertyMap::getModuleProperty(const QString &moduleName,
static QString mapToString(const QVariantMap &map, const QString &prefix)
{
QStringList keys(map.keys());
- qSort(keys);
+ std::sort(keys.begin(), keys.end());
QString stringRep;
for (const QString &key : qAsConst(keys)) {
const QVariant &val = map.value(key);
diff --git a/src/lib/corelib/parser/qmljsparser.cpp b/src/lib/corelib/parser/qmljsparser.cpp
index e90f3af9d..71cff876d 100644
--- a/src/lib/corelib/parser/qmljsparser.cpp
+++ b/src/lib/corelib/parser/qmljsparser.cpp
@@ -69,7 +69,8 @@ void Parser::reallocateStack()
sym_stack = reinterpret_cast<Value*> (realloc(sym_stack, stack_size * sizeof(Value)));
state_stack = reinterpret_cast<int*> (realloc(state_stack, stack_size * sizeof(int)));
location_stack = reinterpret_cast<AST::SourceLocation*> (realloc(location_stack, stack_size * sizeof(AST::SourceLocation)));
- string_stack = reinterpret_cast<QStringRef*> (realloc(string_stack, stack_size * sizeof(QStringRef)));
+ string_stack = reinterpret_cast<QStringRef*> (realloc(
+ static_cast<void *>(string_stack), stack_size * sizeof(QStringRef)));
}
Parser::Parser(Engine *engine):
diff --git a/src/lib/corelib/tools/launcherinterface.cpp b/src/lib/corelib/tools/launcherinterface.cpp
index f635ef250..b16c8563c 100644
--- a/src/lib/corelib/tools/launcherinterface.cpp
+++ b/src/lib/corelib/tools/launcherinterface.cpp
@@ -111,7 +111,8 @@ void LauncherInterface::doStart()
connect(m_process,
static_cast<void (QProcess::*)(QProcess::ProcessError)>(&QProcess::error),
this, &LauncherInterface::handleProcessError);
- connect(m_process, static_cast<void (QProcess::*)(int)>(&QProcess::finished),
+ connect(m_process,
+ static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
this, &LauncherInterface::handleProcessFinished);
connect(m_process, &QProcess::readyReadStandardError,
this, &LauncherInterface::handleProcessStderr);
diff --git a/src/lib/corelib/tools/version.cpp b/src/lib/corelib/tools/version.cpp
index ccc9dd799..7ea2fda75 100644
--- a/src/lib/corelib/tools/version.cpp
+++ b/src/lib/corelib/tools/version.cpp
@@ -94,7 +94,7 @@ Version Version::fromString(const QString &versionString, bool buildNumberAllowe
for (int i = 0; i < 2; ++i)
pattern += QStringLiteral("(?:\\.(\\d+))?"); // Followed by a dot and a number up to two times.
if (buildNumberAllowed)
- pattern += QStringLiteral("(?:-(\\d+))?"); // And possibly a dash followed by the build number.
+ pattern += QStringLiteral("(?:[-.](\\d+))?"); // And possibly a dash or dot followed by the build number.
QRegExp rex(pattern);
if (!rex.exactMatch(versionString))
return Version{};
diff --git a/src/lib/corelib/tools/visualstudioversioninfo.cpp b/src/lib/corelib/tools/visualstudioversioninfo.cpp
index 5383dcae0..008ab115d 100644
--- a/src/lib/corelib/tools/visualstudioversioninfo.cpp
+++ b/src/lib/corelib/tools/visualstudioversioninfo.cpp
@@ -53,7 +53,8 @@ VisualStudioVersionInfo::VisualStudioVersionInfo()
VisualStudioVersionInfo::VisualStudioVersionInfo(const Version &version)
: m_version(version)
{
- QBS_CHECK(version.minorVersion() == 0 || version == Version(7, 1));
+ QBS_CHECK(version.minorVersion() == 0 || version == Version(7, 1)
+ || version.majorVersion() >= 15);
}
std::set<VisualStudioVersionInfo> VisualStudioVersionInfo::knownVersions()
diff --git a/src/libexec/qbs_processlauncher/launchersockethandler.cpp b/src/libexec/qbs_processlauncher/launchersockethandler.cpp
index 2480921eb..53bd81a9a 100644
--- a/src/libexec/qbs_processlauncher/launchersockethandler.cpp
+++ b/src/libexec/qbs_processlauncher/launchersockethandler.cpp
@@ -275,7 +275,7 @@ Process *LauncherSocketHandler::setupProcess(quintptr token)
const auto p = new Process(token, this);
connect(p, static_cast<void (QProcess::*)(QProcess::ProcessError)>(&QProcess::error),
this, &LauncherSocketHandler::handleProcessError);
- connect(p, static_cast<void (QProcess::*)(int)>(&QProcess::finished),
+ connect(p, static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
this, &LauncherSocketHandler::handleProcessFinished);
connect(p, &Process::failedToStop, this, &LauncherSocketHandler::handleStopFailure);
return p;
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 06:35:15 +0000