3 files changed, 22 insertions, 8 deletions
diff --git a/tests/manual/qstorageinfo/printvolumes.cpp b/tests/manual/qstorageinfo/printvolumes.cpp
index 1b1660b433..31047c2fcd 100644
--- a/tests/manual/qstorageinfo/printvolumes.cpp
+++ b/tests/manual/qstorageinfo/printvolumes.cpp
@@ -48,11 +48,15 @@ void printVolumes(const QList<QStorageInfo> &volumes, int (*printer)(const char
         if (info.fileSystemType() != fsAndType)
             fsAndType += " (" + info.fileSystemType() + ')';
 
-        printf("%-19s R%c ", fsAndType.constData(), info.isReadOnly() ? 'O' : 'W');
+        printer("%-19s R%c ", fsAndType.constData(), info.isReadOnly() ? 'O' : 'W');
         if (fsAndType.size() > 19)
-            printf("\n%23s", "");
+            printer("\n%23s", "");
 
-        printf("%10llu %10llu %5u  ", info.bytesTotal() / 1024, info.bytesFree() / 1024, info.blockSize());
-        printf("%-16s %s\n", qPrintable(info.name()), qPrintable(info.rootPath()));
+        printer("%10llu %10llu %5u  ", info.bytesTotal() / 1024, info.bytesFree() / 1024, info.blockSize());
+        if (!info.subvolume().isEmpty())
+            printer("subvol=%-18s ", qPrintable(info.subvolume()));
+        else
+            printer("%-25s ", qPrintable(info.name()));
+        printer("%s\n", qPrintable(info.rootPath()));
     }
 }
diff --git a/tests/manual/qsysinfo/main.cpp b/tests/manual/qsysinfo/main.cpp
index 5add1e4f74..5b391e5dfd 100644
--- a/tests/manual/qsysinfo/main.cpp
+++ b/tests/manual/qsysinfo/main.cpp
@@ -27,11 +27,12 @@
 ****************************************************************************/
 
 #include <QCoreApplication>
+#include <QOperatingSystemVersion>
 #include <QSysInfo>
 
 #include <stdio.h>
 
-// I'm lazy
+#if QT_DEPRECATED_SINCE(5, 9)
 #define CASE_VERSION(v)     case QSysInfo::v:   return QT_STRINGIFY(v)
 
 QByteArray windowsVersionToString(QSysInfo::WinVersion v)
@@ -108,6 +109,7 @@ QByteArray macVersionToString(QSysInfo::MacVersion v)
     }
     return "MacVersion(Q_MV_OSX(10, " + QByteArray::number(v - 2) + "))";
 }
+#endif
 
 int main(int argc, char *argv[])
 {
@@ -116,10 +118,12 @@ int main(int argc, char *argv[])
     printf("QSysInfo::WordSize = %d\n", QSysInfo::WordSize);
     printf("QSysInfo::ByteOrder = QSysInfo::%sEndian\n",
            QSysInfo::ByteOrder == QSysInfo::LittleEndian ? "Little" : "Big");
+#if QT_DEPRECATED_SINCE(5, 9)
     printf("QSysInfo::WindowsVersion = QSysInfo::%s\n",
            windowsVersionToString(QSysInfo::WindowsVersion).constData());
     printf("QSysInfo::MacintoshVersion = QSysInfo::%s\n",
            macVersionToString(QSysInfo::MacintoshVersion).constData());
+#endif
     printf("QSysInfo::buildCpuArchitecture() = %s\n", qPrintable(QSysInfo::buildCpuArchitecture()));
     printf("QSysInfo::currentCpuArchitecture() = %s\n", qPrintable(QSysInfo::currentCpuArchitecture()));
     printf("QSysInfo::buildAbi() = %s\n", qPrintable(QSysInfo::buildAbi()));
@@ -130,5 +134,12 @@ int main(int argc, char *argv[])
     printf("QSysInfo::prettyProductName() = %s\n", qPrintable(QSysInfo::prettyProductName()));
     printf("QSysInfo::machineHostName() = %s\n", qPrintable(QSysInfo::machineHostName()));
 
+    const auto osv = QOperatingSystemVersion::current();
+    printf("QOperatingSystemVersion::current() = %s %d.%d.%d\n",
+        qPrintable(osv.name()),
+        osv.majorVersion(),
+        osv.minorVersion(),
+        osv.microVersion());
+
     return 0;
 }
diff --git a/tests/manual/windowchildgeometry/controllerwidget.cpp b/tests/manual/windowchildgeometry/controllerwidget.cpp
index afea71f171..1d18c5d51b 100644
--- a/tests/manual/windowchildgeometry/controllerwidget.cpp
+++ b/tests/manual/windowchildgeometry/controllerwidget.cpp
@@ -284,7 +284,7 @@ public:
     {
         setObjectName(QStringLiteral("window"));
         setTitle(tr("TestWindow"));
-        setFlags(flags() | Qt::MacUseNSWindow);
+        setProperty("_q_platform_MacUseNSWindow", QVariant(true));
     }
 
 protected:
@@ -317,7 +317,7 @@ void Window::mousePressEvent(QMouseEvent * ev)
     m_mouseDownPosition = ev->pos();
 }
 
-void Window::mouseReleaseEvent(QMouseEvent * e)
+void Window::mouseReleaseEvent(QMouseEvent *)
 {
     m_mouseDownPosition = QPoint();
 }
@@ -408,7 +408,6 @@ WindowControl::WindowControl(QWindow *w )
 
 void WindowControl::refresh()
 {
-    const QWindow *w = static_cast<const QWindow *>(m_object);
     BaseWindowControl::refresh();
 }