summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVille Voutilainen <ville.voutilainen@qt.io>2018-02-27 18:52:38 +0200
committerShawn Rutledge <shawn.rutledge@qt.io>2018-11-19 13:58:26 +0000
commit3a798695bcda58b3884a9ba278aeca4c79f21ae0 (patch)
treef4103a1ce08d7e5362808a5cd9e7e2dc6ed6e122
parentbe7ac7129acd6990220ff87d99c3da645b579d21 (diff)
downloadqtx11extras-3a798695bcda58b3884a9ba278aeca4c79f21ae0.tar.gz
Silence GCC8 warnings in qx11info
Change-Id: I50fe500de9d274f1b78151992162344a25894b1d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> (cherry picked from commit d80236f50559f4fe785fba598a03aaa7f05d37ac) Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
-rw-r--r--src/x11extras/qx11info_x11.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/x11extras/qx11info_x11.cpp b/src/x11extras/qx11info_x11.cpp
index 31bc405..2cea533 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