diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2016-09-04 19:56:46 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2016-09-23 07:26:45 +0000 |
| commit | 0f91218091da69a81eb3e3336d1bdbe572a21908 (patch) | |
| tree | 03d2ce97e5416826694cc798432eda762246f36c | |
| parent | 448211f022507c6e7787e47aca4b3f12e3f12d94 (diff) | |
| download | qtx11extras-5.8.0-beta1.tar.gz | |
Eradicate last Q_FOREACH and mark the library as Q_FOREACH-free and warning_cleanv5.8.0-beta1
The only public header, qx11info_x11.h isn't actually recognized
by headersclean as a public header, so warning_clean has no effect.
But the header _is_ clean, and maybe headersclean in QtBase will be
fixed at some point.
Change-Id: I23ef8476bee111685d7261322b4f7af47498dc96
Reviewed-by: Gabriel Hege <hege@daviko.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| -rw-r--r-- | .qmake.conf | 3 | ||||
| -rw-r--r-- | src/x11extras/qx11info_x11.cpp | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/.qmake.conf b/.qmake.conf index aefa1e7..d1e1c4c 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,6 @@ load(qt_build_config) +CONFIG += warning_clean +DEFINES += QT_NO_FOREACH + MODULE_VERSION = 5.8.0 diff --git a/src/x11extras/qx11info_x11.cpp b/src/x11extras/qx11info_x11.cpp index f40f876..31bc405 100644 --- a/src/x11extras/qx11info_x11.cpp +++ b/src/x11extras/qx11info_x11.cpp @@ -60,7 +60,8 @@ QT_BEGIN_NAMESPACE static QScreen *findScreenForVirtualDesktop(int virtualDesktopNumber) { - foreach (QScreen *screen, QGuiApplication::screens()) { + const auto screens = QGuiApplication::screens(); + for (QScreen *screen : screens) { if (QXcbScreenFunctions::virtualDesktopNumber(screen) == virtualDesktopNumber) return screen; } |