Fix compiler warnings on macOS

Change-Id: I865357bf74bdaf88eabae5681c70a6e5032e274d
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

5 files changed, 7 insertions, 6 deletions

diff --git a/examples/cocoa-touch-application/CocoaTouchApplication/MasterViewController.m b/examples/cocoa-touch-application/CocoaTouchApplication/MasterViewController.m
index 6024d67c4..ebac52dcd 100644
--- a/examples/cocoa-touch-application/CocoaTouchApplication/MasterViewController.m
+++ b/examples/cocoa-touch-application/CocoaTouchApplication/MasterViewController.m
@@ -43,7 +43,7 @@
         self.title = NSLocalizedString(@"Master", @"Master");
         if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad) {
             self.clearsSelectionOnViewWillAppear = NO;
-            self.contentSizeForViewInPopover = CGSizeMake(320.0, 600.0);
+            self.preferredContentSize = CGSizeMake(320.0, 600.0);
         }
     }
     return self;
diff --git a/src/lib/corelib/tools/stringutils.h b/src/lib/corelib/tools/stringutils.h
index 7b551a544..59acdccbd 100644
--- a/src/lib/corelib/tools/stringutils.h
+++ b/src/lib/corelib/tools/stringutils.h
@@ -77,14 +77,14 @@ static inline std::string trimmed(const std::string &s)
     // trim from start
     static const auto ltrim = [](std::string &s) -> std::string & {
         s.erase(s.begin(), std::find_if(s.begin(), s.end(),
-                std::not1(std::ptr_fun<int, int>(std::isspace))));
+                [](char c){ return !std::isspace(c); }));
         return s;
     };
 
     // trim from end
     static const auto rtrim = [](std::string &s) -> std::string & {
         s.erase(std::find_if(s.rbegin(), s.rend(),
-                std::not1(std::ptr_fun<int, int>(std::isspace))).base(), s.end());
+                [](char c){ return !std::isspace(c); }).base(), s.end());
         return s;
     };
 
diff --git a/src/plugins/generator/iarew/iarewfileversionproperty.cpp b/src/plugins/generator/iarew/iarewfileversionproperty.cpp
index 446b385b8..b84f37301 100644
--- a/src/plugins/generator/iarew/iarewfileversionproperty.cpp
+++ b/src/plugins/generator/iarew/iarewfileversionproperty.cpp
@@ -40,7 +40,7 @@ static QByteArray buildFileVersion(const IarewVersionInfo &versionInfo)
     case 7:
     case 8:
     case 10:
-        return QByteArrayLiteral('3');
+        return QByteArrayLiteral("3");
     default:
         return {};
     }
diff --git a/src/plugins/generator/iarew/iarewsourcefilepropertygroup.h b/src/plugins/generator/iarew/iarewsourcefilepropertygroup.h
index 5f88cec27..6d0083573 100644
--- a/src/plugins/generator/iarew/iarewsourcefilepropertygroup.h
+++ b/src/plugins/generator/iarew/iarewsourcefilepropertygroup.h
@@ -36,7 +36,7 @@
 namespace qbs {
 
 class ArtifactData;
-class GeneratableProject;
+struct GeneratableProject;
 
 class IarewSourceFilePropertyGroup final
         : public gen::xml::PropertyGroup
diff --git a/tests/fuzzy-test/fuzzytester.cpp b/tests/fuzzy-test/fuzzytester.cpp
index b836ee623..045e46718 100644
--- a/tests/fuzzy-test/fuzzytester.cpp
+++ b/tests/fuzzy-test/fuzzytester.cpp
@@ -36,6 +36,7 @@
 #include <algorithm>
 #include <cstdlib>
 #include <ctime>
+#include <random>
 
 static QString resolveIncrementalActivity() { return "resolve-incremental"; }
 static QString buildIncrementalActivity() { return "build-incremental"; }
@@ -71,7 +72,7 @@ void FuzzyTester::runTest(const QString &profile, const QString &startCommit,
     // Shuffle the initial sequence. Otherwise all invocations of the tool with the same start
     // commit would try the same sequence of commits.
     std::srand(std::time(nullptr));
-    std::random_shuffle(allCommits.begin(), allCommits.end());
+    std::shuffle(allCommits.begin(), allCommits.end(), std::mt19937(std::random_device()()));
 
     quint64 run = 0;
     QStringList buildSequence(workingStartCommit);