diff options
| -rw-r--r-- | .qmake.conf | 5 | ||||
| -rw-r--r-- | src/src.pro | 3 | ||||
| -rw-r--r-- | src/x11extras/qx11info_x11.cpp | 3 | ||||
| -rw-r--r-- | tests/tests.pro | 3 |
4 files changed, 10 insertions, 4 deletions
diff --git a/.qmake.conf b/.qmake.conf index a2a0d41..d1e1c4c 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,6 @@ load(qt_build_config) -MODULE_VERSION = 5.7.1 +CONFIG += warning_clean +DEFINES += QT_NO_FOREACH + +MODULE_VERSION = 5.8.0 diff --git a/src/src.pro b/src/src.pro index 4961552..b1a97ea 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,4 +1,5 @@ TEMPLATE = subdirs -contains(QT_CONFIG, xcb) { +QT_FOR_CONFIG += gui-private +qtConfig(xcb) { SUBDIRS += x11extras } 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; } diff --git a/tests/tests.pro b/tests/tests.pro index 2d5ca19..d1a5e17 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -1,5 +1,6 @@ TEMPLATE = subdirs +QT_FOR_CONFIG += gui-private -contains(QT_CONFIG, xcb) { +qtConfig(xcb) { SUBDIRS += auto } |