From 29719f7a3ac17c76571825e3b57e7278f9a290b7 Mon Sep 17 00:00:00 2001
From: Robert Griebl <robert.griebl@qt.io>
Date: Tue, 12 May 2020 02:10:44 +0200
Subject: Fix warnings in builds against Qt 5.15

Change-Id: Idcce8c3972302b8621946a2ee2818aa8bf83a807
Reviewed-by: Bernd Weimer <bernd.weimer@pelagicore.com>
---
 src/common-lib/configcache_p.h   |  1 +
 src/common-lib/utilities.cpp     | 11 ++++++-----
 src/main-lib/configuration_p.h   |  1 +
 src/window-lib/windowmanager.cpp |  4 ++--
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/common-lib/configcache_p.h b/src/common-lib/configcache_p.h
index 8e690097..2bd4eb27 100644
--- a/src/common-lib/configcache_p.h
+++ b/src/common-lib/configcache_p.h
@@ -82,3 +82,4 @@ public:
 };
 
 QT_END_NAMESPACE_AM
+// We mean it. Dummy comment since syncqt needs this also for completely private Qt modules.
diff --git a/src/common-lib/utilities.cpp b/src/common-lib/utilities.cpp
index 79105668..eeee57c3 100644
--- a/src/common-lib/utilities.cpp
+++ b/src/common-lib/utilities.cpp
@@ -153,7 +153,8 @@ QMultiMap<QString, QString> mountedDirectories()
     int count = getmntinfo(&sfs, MNT_NOWAIT);
 
     for (int i = 0; i < count; ++i, ++sfs) {
-        result.insertMulti(QString::fromLocal8Bit(sfs->f_mntonname), QString::fromLocal8Bit(sfs->f_mntfromname));
+        result.insert(QString::fromLocal8Bit(sfs->f_mntonname),
+                      QString::fromLocal8Bit(sfs->f_mntfromname));
     }
 #else
     FILE *pm = fopen("/proc/self/mounts", "r");
@@ -162,8 +163,8 @@ QMultiMap<QString, QString> mountedDirectories()
 
 #  if defined(Q_OS_ANDROID)
     while (struct mntent *mntPtr = getmntent(pm)) {
-        result.insertMulti(QString::fromLocal8Bit(mntPtr->mnt_dir),
-                           QString::fromLocal8Bit(mntPtr->mnt_fsname));
+        result.insert(QString::fromLocal8Bit(mntPtr->mnt_dir),
+                      QString::fromLocal8Bit(mntPtr->mnt_fsname));
     }
 #  else
     int pathMax = static_cast<int>(pathconf("/", _PC_PATH_MAX)) * 2 + 1024;  // quite big, but better be safe than sorry
@@ -171,8 +172,8 @@ QMultiMap<QString, QString> mountedDirectories()
     struct mntent mntBuf;
 
     while (getmntent_r(pm, &mntBuf, strBuf.data(), pathMax - 1)) {
-        result.insertMulti(QString::fromLocal8Bit(mntBuf.mnt_dir),
-                           QString::fromLocal8Bit(mntBuf.mnt_fsname));
+        result.insert(QString::fromLocal8Bit(mntBuf.mnt_dir),
+                      QString::fromLocal8Bit(mntBuf.mnt_fsname));
     }
 #  endif
     fclose(pm);
diff --git a/src/main-lib/configuration_p.h b/src/main-lib/configuration_p.h
index 0b0f9c4f..b0897704 100644
--- a/src/main-lib/configuration_p.h
+++ b/src/main-lib/configuration_p.h
@@ -168,3 +168,4 @@ struct ConfigurationData
 };
 
 QT_END_NAMESPACE_AM
+// We mean it. Dummy comment since syncqt needs this also for completely private Qt modules.
diff --git a/src/window-lib/windowmanager.cpp b/src/window-lib/windowmanager.cpp
index 264f2272..1e3f480f 100644
--- a/src/window-lib/windowmanager.cpp
+++ b/src/window-lib/windowmanager.cpp
@@ -936,7 +936,7 @@ bool WindowManager::makeScreenshot(const QString &filename, const QString &selec
         });
         apps.erase(it, apps.end());
 
-        auto grabbers = new QList<QSharedPointer<QQuickItemGrabResult>>;
+        auto grabbers = new QList<QSharedPointer<const QQuickItemGrabResult>>;
 
         for (const Window *w : qAsConst(d->windowsInModel)) {
             if (apps.contains(w->application())) {
@@ -959,7 +959,7 @@ bool WindowManager::makeScreenshot(const QString &filename, const QString &selec
 
                             if (onScreen) {
                                 foundAtLeastOne = true;
-                                QSharedPointer<QQuickItemGrabResult> grabber = windowItem->grabToImage();
+                                QSharedPointer<const QQuickItemGrabResult> grabber = windowItem->grabToImage();
 
                                 if (!grabber) {
                                     result = false;
-- 
cgit v1.2.3