summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/xcb/qxcbnativeinterface.cpp
diff options
context:
space:
mode:
authorVille Voutilainen <ville.voutilainen@qt.io>2018-02-27 15:28:18 +0200
committerVille Voutilainen <ville.voutilainen@qt.io>2018-02-27 14:57:14 +0000
commit1b72d3e645a41c7b7f7731cecbd7119b8e7f7f28 (patch)
tree123dbdd1d1d541688593002769a633d5e0dbdce4 /src/plugins/platforms/xcb/qxcbnativeinterface.cpp
parent7eac2e7350f8831a7d79085897496f9373284d3d (diff)
Silence a GCC 8 warning in qxcbnativeinterface
qtbase/src/plugins/platforms/xcb/qxcbnativeinterface.cpp:309:65: error: cast between incompatible function types from ‘void (*)(const char*)’ to ‘QPlatformNativeInterface::NativeResourceForIntegrationFunction’ {aka ‘void* (*)()’} [-Werror=cast-function-type] return NativeResourceForIntegrationFunction(setStartupId); Change-Id: I83409b3a6cc67ccb4c9e91e592e6a01bb6ce45ea Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbnativeinterface.cpp')
-rw-r--r--src/plugins/platforms/xcb/qxcbnativeinterface.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/platforms/xcb/qxcbnativeinterface.cpp b/src/plugins/platforms/xcb/qxcbnativeinterface.cpp
index 22d90d6ac2..db44e58cbb 100644
--- a/src/plugins/platforms/xcb/qxcbnativeinterface.cpp
+++ b/src/plugins/platforms/xcb/qxcbnativeinterface.cpp
@@ -306,13 +306,13 @@ QPlatformNativeInterface::NativeResourceForIntegrationFunction QXcbNativeInterfa
return func;
if (lowerCaseResource == "setstartupid")
- return NativeResourceForIntegrationFunction(setStartupId);
+ return NativeResourceForIntegrationFunction(reinterpret_cast<void *>(setStartupId));
if (lowerCaseResource == "generatepeekerid")
- return NativeResourceForIntegrationFunction(generatePeekerId);
+ return NativeResourceForIntegrationFunction(reinterpret_cast<void *>(generatePeekerId));
if (lowerCaseResource == "removepeekerid")
- return NativeResourceForIntegrationFunction(removePeekerId);
+ return NativeResourceForIntegrationFunction(reinterpret_cast<void *>(removePeekerId));
if (lowerCaseResource == "peekeventqueue")
- return NativeResourceForIntegrationFunction(peekEventQueue);
+ return NativeResourceForIntegrationFunction(reinterpret_cast<void *>(peekEventQueue));
return 0;
}
@@ -334,9 +334,9 @@ QPlatformNativeInterface::NativeResourceForScreenFunction QXcbNativeInterface::n
return func;
if (lowerCaseResource == "setapptime")
- return NativeResourceForScreenFunction(setAppTime);
+ return NativeResourceForScreenFunction(reinterpret_cast<void *>(setAppTime));
else if (lowerCaseResource == "setappusertime")
- return NativeResourceForScreenFunction(setAppUserTime);
+ return NativeResourceForScreenFunction(reinterpret_cast<void *>(setAppUserTime));
return 0;
}
@@ -388,7 +388,7 @@ QFunctionPointer QXcbNativeInterface::platformFunction(const QByteArray &functio
}
if (function == QXcbScreenFunctions::virtualDesktopNumberIdentifier())
- return QFunctionPointer(QXcbScreenFunctions::VirtualDesktopNumber(QXcbScreen::virtualDesktopNumberStatic));
+ return QFunctionPointer(QXcbScreenFunctions::VirtualDesktopNumber(reinterpret_cast<void *>(QXcbScreen::virtualDesktopNumberStatic)));
return nullptr;
}