From d80236f50559f4fe785fba598a03aaa7f05d37ac Mon Sep 17 00:00:00 2001
From: Ville Voutilainen <ville.voutilainen@qt.io>
Date: Tue, 27 Feb 2018 18:52:38 +0200
Subject: Silence GCC8 warnings in qx11info

Change-Id: I50fe500de9d274f1b78151992162344a25894b1d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 src/x11extras/qx11info_x11.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/x11extras/qx11info_x11.cpp b/src/x11extras/qx11info_x11.cpp
index 9f5d8a2..f503509 100644
--- a/src/x11extras/qx11info_x11.cpp
+++ b/src/x11extras/qx11info_x11.cpp
@@ -250,7 +250,7 @@ void QX11Info::setAppTime(unsigned long time)
         return;
     typedef void (*SetAppTimeFunc)(QScreen *, xcb_timestamp_t);
     QScreen* screen = QGuiApplication::primaryScreen();
-    SetAppTimeFunc func = reinterpret_cast<SetAppTimeFunc>(native->nativeResourceFunctionForScreen("setapptime"));
+    SetAppTimeFunc func = reinterpret_cast<SetAppTimeFunc>(reinterpret_cast<void *>(native->nativeResourceFunctionForScreen("setapptime")));
     if (func)
         func(screen, time);
     else
@@ -271,7 +271,7 @@ void QX11Info::setAppUserTime(unsigned long time)
         return;
     typedef void (*SetAppUserTimeFunc)(QScreen *, xcb_timestamp_t);
     QScreen* screen = QGuiApplication::primaryScreen();
-    SetAppUserTimeFunc func = reinterpret_cast<SetAppUserTimeFunc>(native->nativeResourceFunctionForScreen("setappusertime"));
+    SetAppUserTimeFunc func = reinterpret_cast<SetAppUserTimeFunc>(reinterpret_cast<void *>(native->nativeResourceFunctionForScreen("setappusertime")));
     if (func)
         func(screen, time);
     else
@@ -337,7 +337,7 @@ void QX11Info::setNextStartupId(const QByteArray &id)
     if (!native)
         return;
     typedef void (*SetStartupIdFunc)(const char*);
-    SetStartupIdFunc func = reinterpret_cast<SetStartupIdFunc>(native->nativeResourceFunctionForIntegration("setstartupid"));
+    SetStartupIdFunc func = reinterpret_cast<SetStartupIdFunc>(reinterpret_cast<void *>(native->nativeResourceFunctionForIntegration("setstartupid")));
     if (func)
         func(id.constData());
     else
@@ -423,7 +423,7 @@ qint32 QX11Info::generatePeekerId()
 
     typedef qint32 (*GeneratePeekerIdFunc)(void);
     GeneratePeekerIdFunc generatepeekerid = reinterpret_cast<GeneratePeekerIdFunc>(
-                native->nativeResourceFunctionForIntegration("generatepeekerid"));
+                reinterpret_cast<void *>(native->nativeResourceFunctionForIntegration("generatepeekerid")));
     if (!generatepeekerid) {
         qWarning("Internal error: QPA plugin doesn't implement generatePeekerId");
         return -1;
@@ -451,7 +451,7 @@ bool QX11Info::removePeekerId(qint32 peekerId)
 
     typedef bool (*RemovePeekerIdFunc)(qint32);
     RemovePeekerIdFunc removePeekerId = reinterpret_cast<RemovePeekerIdFunc>(
-                native->nativeResourceFunctionForIntegration("removepeekerid"));
+                reinterpret_cast<void *>(native->nativeResourceFunctionForIntegration("removepeekerid")));
     if (!removePeekerId) {
         qWarning("Internal error: QPA plugin doesn't implement removePeekerId");
         return false;
@@ -552,7 +552,7 @@ bool QX11Info::peekEventQueue(PeekerCallback peeker, void *peekerData, PeekOptio
 
     typedef bool (*PeekEventQueueFunc)(PeekerCallback, void *, PeekOptions, qint32);
     PeekEventQueueFunc peekeventqueue = reinterpret_cast<PeekEventQueueFunc>(
-                native->nativeResourceFunctionForIntegration("peekeventqueue"));
+                reinterpret_cast<void *>(native->nativeResourceFunctionForIntegration("peekeventqueue")));
     if (!peekeventqueue) {
         qWarning("Internal error: QPA plugin doesn't implement peekEventQueue");
         return false;
-- 
cgit v1.2.1