summaryrefslogtreecommitdiff
path: root/src/x11extras/qx11info_x11.h
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-07-02 09:54:30 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-09-09 10:30:23 +0200
commit0110ca6ffb12d610b88fc117d924cf9b09c2c0fc (patch)
treed3d2aaec104ae63edf4d81b0d94f74b15bf475dd /src/x11extras/qx11info_x11.h
parent444b66a440890986094b0499f5b299fae9f8d646 (diff)
downloadqtx11extras-0110ca6ffb12d610b88fc117d924cf9b09c2c0fc.tar.gz
Update signatures for Qt6
Changed to match the types of xcb_window_t and xcb_timestamp_t. Change-Id: I002b354078d5291442f2d588f9ce05657e17dfba Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/x11extras/qx11info_x11.h')
-rw-r--r--src/x11extras/qx11info_x11.h14
1 files changed, 5 insertions, 9 deletions
diff --git a/src/x11extras/qx11info_x11.h b/src/x11extras/qx11info_x11.h
index 20f048a..988c4a5 100644
--- a/src/x11extras/qx11info_x11.h
+++ b/src/x11extras/qx11info_x11.h
@@ -63,20 +63,16 @@ public:
static int appDpiX(int screen=-1);
static int appDpiY(int screen=-1);
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
- static unsigned long appRootWindow(int screen=-1);
-#else
static quint32 appRootWindow(int screen=-1);
-#endif
static int appScreen();
- static unsigned long appTime();
- static unsigned long appUserTime();
+ static quint32 appTime();
+ static quint32 appUserTime();
- static void setAppTime(unsigned long time);
- static void setAppUserTime(unsigned long time);
+ static void setAppTime(quint32 time);
+ static void setAppUserTime(quint32 time);
- static unsigned long getTimestamp();
+ static quint32 getTimestamp();
static QByteArray nextStartupId();
static void setNextStartupId(const QByteArray &id);