diff options
author | Liang Qi <liang.qi@qt.io> | 2017-08-15 12:23:23 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-08-15 13:18:15 +0200 |
commit | ffa5a03da503c3cd00f960debf3f43b85958c874 (patch) | |
tree | dc1604dd2b945d30998e11f01a0eed6842eaa6c9 | |
parent | d4c6ba6afe1d7a3165f1ac108fef6eb2b994175a (diff) | |
parent | 17c9df2e5945a06944d8e9d75d1cba25bc885ecb (diff) |
Merge remote-tracking branch 'origin/5.9' into devv5.10.0-beta3v5.10.0-beta2v5.10.0-beta1v5.10.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I1c6e79301402751efe0e38d48cd7b1235c3c7942
-rw-r--r-- | dist/changes-5.9.1 | 24 | ||||
-rw-r--r-- | src/plugins/gamepads/evdev/qevdevgamepadbackend.cpp | 3 |
2 files changed, 27 insertions, 0 deletions
diff --git a/dist/changes-5.9.1 b/dist/changes-5.9.1 new file mode 100644 index 0000000..e0a6a4b --- /dev/null +++ b/dist/changes-5.9.1 @@ -0,0 +1,24 @@ +Qt 5.9.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.9.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +http://doc.qt.io/qt-5/index.html + +The Qt version 5.9 series is binary compatible with the 5.8.x series. +Applications compiled for 5.8 will continue to run with 5.9. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* Library * +**************************************************************************** + + - This release contains only minor code improvements. diff --git a/src/plugins/gamepads/evdev/qevdevgamepadbackend.cpp b/src/plugins/gamepads/evdev/qevdevgamepadbackend.cpp index d427296..7fc8466 100644 --- a/src/plugins/gamepads/evdev/qevdevgamepadbackend.cpp +++ b/src/plugins/gamepads/evdev/qevdevgamepadbackend.cpp @@ -34,6 +34,9 @@ ** ****************************************************************************/ +#include <QtCore/qglobal.h> +QT_WARNING_DISABLE_GCC("-Wmaybe-uninitialized") // GCC warnings don't make sense, so disable + #include "qevdevgamepadbackend_p.h" #include <QtCore/QSocketNotifier> #include <QtCore/QLoggingCategory> |