summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.qmake.conf2
-rw-r--r--src/x11extras/qx11info_x11.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/.qmake.conf b/.qmake.conf
index 6fb07da..6cfd011 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.10.1
+MODULE_VERSION = 5.11.0
diff --git a/src/x11extras/qx11info_x11.cpp b/src/x11extras/qx11info_x11.cpp
index e64ba9c..9f5d8a2 100644
--- a/src/x11extras/qx11info_x11.cpp
+++ b/src/x11extras/qx11info_x11.cpp
@@ -65,7 +65,7 @@ static QScreen *findScreenForVirtualDesktop(int virtualDesktopNumber)
if (QXcbScreenFunctions::virtualDesktopNumber(screen) == virtualDesktopNumber)
return screen;
}
- return Q_NULLPTR;
+ return nullptr;
}
/*!