diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | dist/changes-5.12.0 | 18 | ||||
| -rw-r--r-- | src/x11extras/qx11info_x11.cpp | 17 | ||||
| -rw-r--r-- | src/x11extras/qx11info_x11.h | 4 |
4 files changed, 34 insertions, 7 deletions
diff --git a/.qmake.conf b/.qmake.conf index b952473..bc074d5 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -3,4 +3,4 @@ load(qt_build_config) CONFIG += warning_clean DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.11.3 +MODULE_VERSION = 5.12.0 diff --git a/dist/changes-5.12.0 b/dist/changes-5.12.0 new file mode 100644 index 0000000..4f6c63e --- /dev/null +++ b/dist/changes-5.12.0 @@ -0,0 +1,18 @@ +Qt 5.12 introduces many new features and improvements as well as bugfixes +over the 5.11.x series. For more details, refer to the online documentation +included in this distribution. The documentation is also available online: + +https://doc.qt.io/qt-5/index.html + +The Qt version 5.12 series is binary compatible with the 5.11.x series. +Applications compiled for 5.11 will continue to run with 5.12. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + + - This release contains only minor code improvements. diff --git a/src/x11extras/qx11info_x11.cpp b/src/x11extras/qx11info_x11.cpp index f503509..394a629 100644 --- a/src/x11extras/qx11info_x11.cpp +++ b/src/x11extras/qx11info_x11.cpp @@ -164,7 +164,12 @@ int QX11Info::appDpiY(int screen) \sa QApplication::desktop() */ +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) +// ### Qt 6: remove unsigned long QX11Info::appRootWindow(int screen) +#else +quint32 QX11Info::appRootWindow(int screen) +#endif { if (!qApp) return 0; @@ -310,10 +315,10 @@ unsigned long QX11Info::getTimestamp() QByteArray QX11Info::nextStartupId() { if (!qApp) - return 0; + return QByteArray(); QPlatformNativeInterface *native = qApp->platformNativeInterface(); if (!native) - return 0; + return QByteArray(); return static_cast<char *>(native->nativeResourceForIntegration("startupid")); } @@ -352,10 +357,10 @@ void QX11Info::setNextStartupId(const QByteArray &id) Display *QX11Info::display() { if (!qApp) - return NULL; + return nullptr; QPlatformNativeInterface *native = qApp->platformNativeInterface(); if (!native) - return NULL; + return nullptr; void *display = native->nativeResourceForIntegration(QByteArray("display")); return reinterpret_cast<Display *>(display); @@ -369,10 +374,10 @@ Display *QX11Info::display() xcb_connection_t *QX11Info::connection() { if (!qApp) - return NULL; + return nullptr; QPlatformNativeInterface *native = qApp->platformNativeInterface(); if (!native) - return NULL; + return nullptr; void *connection = native->nativeResourceForIntegration(QByteArray("connection")); return reinterpret_cast<xcb_connection_t *>(connection); diff --git a/src/x11extras/qx11info_x11.h b/src/x11extras/qx11info_x11.h index c0bfbf8..20f048a 100644 --- a/src/x11extras/qx11info_x11.h +++ b/src/x11extras/qx11info_x11.h @@ -63,7 +63,11 @@ 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(); |