diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-08-16 20:39:29 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-08-16 20:39:29 +0300 |
| commit | 982f20eb585d77e5b5c721e05a466d7161f7f2d1 (patch) | |
| tree | ee762d754e4d38b49bee7c047ed014ed33867932 | |
| parent | 0dfaf36ec6f642a0fd583ce1cc33a31eb6b3328e (diff) | |
| parent | d880cc02604a14a5869efa940f2d09001c34f80d (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.6' into tqtc/lts-5.15-opensourcev5.15.6-lts-lgpl
Change-Id: I24fafb7caf27c7de45b69c20fa627d9af50e12d6
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/x11extras/qx11info_x11.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.qmake.conf b/.qmake.conf index b8e1161..53c1ac9 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.15.5 +MODULE_VERSION = 5.15.6 diff --git a/src/x11extras/qx11info_x11.cpp b/src/x11extras/qx11info_x11.cpp index 7b6b2a0..4f48339 100644 --- a/src/x11extras/qx11info_x11.cpp +++ b/src/x11extras/qx11info_x11.cpp @@ -73,6 +73,7 @@ static QScreen *findScreenForVirtualDesktop(int virtualDesktopNumber) \inmodule QtX11Extras \since 5.1 \brief Provides information about the X display configuration. + \obsolete The class provides two APIs: a set of non-static functions that provide information about a specific widget or pixmap, and a set |