Merge branch 'wip/qt6' into wip/cmake

Change-Id: I50ac36b8803c296998149e98cc61e38687cdd14b

1 files changed, 2 insertions, 5 deletions

diff --git a/src/testlib/qbenchmarkperfevents.cpp b/src/testlib/qbenchmarkperfevents.cpp
index 91f0792338..e8c6969d4a 100644
--- a/src/testlib/qbenchmarkperfevents.cpp
+++ b/src/testlib/qbenchmarkperfevents.cpp
@@ -147,7 +147,7 @@ bool QBenchmarkPerfEventsMeasurer::isAvailable()
 {
     // this generates an EFAULT because attr == NULL if perf_event_open is available
     // if the kernel is too old, it generates ENOSYS
-    return perf_event_open(0, 0, 0, 0, 0) == -1 && errno != ENOSYS;
+    return perf_event_open(nullptr, 0, 0, 0, 0) == -1 && errno != ENOSYS;
 }
 
 /* Event list structure
@@ -500,10 +500,7 @@ void QBenchmarkPerfEventsMeasurer::listCounters()
            "Attributes can be combined, for example: -perfcounter branch-mispredicts:kh\n");
 }
 
-QBenchmarkPerfEventsMeasurer::QBenchmarkPerfEventsMeasurer()
-    : fd(-1)
-{
-}
+QBenchmarkPerfEventsMeasurer::QBenchmarkPerfEventsMeasurer() = default;
 
 QBenchmarkPerfEventsMeasurer::~QBenchmarkPerfEventsMeasurer()
 {