Merge 1.13 into master

Change-Id: I0678ef8cf6f81489914e79be903ca4d4c1cebada

6 files changed, 23 insertions, 16 deletions

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()