From 8dae14239247281ce36a9e92308a506f149574db Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Sat, 9 Nov 2019 16:41:49 +0100 Subject: Doc: Fix documentation warning for QX11Info::appRootWindow() The QT_VERSION_CHECK macro interferes with QDoc's ability to match function documentation to the signature. Resolve this by moving the documentation comment to right above the function signature. Fixes: QTBUG-79825 Change-Id: I48491ab67922a61f21202eaa2213259c2624f80d Reviewed-by: Paul Wicking --- src/x11extras/qx11info_x11.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/x11extras/qx11info_x11.cpp b/src/x11extras/qx11info_x11.cpp index 394a629..7b6b2a0 100644 --- a/src/x11extras/qx11info_x11.cpp +++ b/src/x11extras/qx11info_x11.cpp @@ -154,6 +154,8 @@ int QX11Info::appDpiY(int screen) return scr->logicalDotsPerInchY(); } +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) +// ### Qt 6: remove /*! Returns a handle for the applications root window on the given \a screen. @@ -164,8 +166,6 @@ 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) -- cgit v1.2.1