diff options
author | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:06:31 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:39:43 +0200 |
commit | d4c6ba6afe1d7a3165f1ac108fef6eb2b994175a (patch) | |
tree | 311749eccc22c871cc9c43c425a4018735a04a99 | |
parent | e5f9fbd342574bada201b5a96d8a2a68f2f37cf1 (diff) | |
parent | fcffc32b64ea1d01503dafd8e16613d009c8ad34 (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: Icc2815181c118f89f333dc134ecf43b5671d2d38
-rw-r--r-- | dist/changes-5.9.0 | 16 | ||||
-rw-r--r-- | src/imports/gamepad/qtgamepad.cpp | 8 | ||||
-rw-r--r-- | src/plugins/gamepads/gamepads.pro | 2 | ||||
-rw-r--r-- | src/plugins/gamepads/sdl2/qsdlgamepadbackend.cpp | 2 |
4 files changed, 27 insertions, 1 deletions
diff --git a/dist/changes-5.9.0 b/dist/changes-5.9.0 new file mode 100644 index 0000000..e33a407 --- /dev/null +++ b/dist/changes-5.9.0 @@ -0,0 +1,16 @@ +Qt 5.9 introduces many new features and improvements as well as bugfixes +over the 5.8.x series. 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. diff --git a/src/imports/gamepad/qtgamepad.cpp b/src/imports/gamepad/qtgamepad.cpp index 7ecee2d..3b81dec 100644 --- a/src/imports/gamepad/qtgamepad.cpp +++ b/src/imports/gamepad/qtgamepad.cpp @@ -43,6 +43,13 @@ #include "qgamepadmouseitem.h" +static void initResources() +{ +#ifdef QT_STATIC + Q_INIT_RESOURCE(qmake_QtGamepad); +#endif +} + QT_BEGIN_NAMESPACE static QObject *gamepadmanager_singletontype_provider(QQmlEngine * /* engine */, QJSEngine * /* scriptEngine */) @@ -57,6 +64,7 @@ class QGamepadModule : public QQmlExtensionPlugin Q_OBJECT Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: + QGamepadModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } void registerTypes(const char *uri) { Q_ASSERT(QLatin1String(uri) == QLatin1String("QtGamepad")); diff --git a/src/plugins/gamepads/gamepads.pro b/src/plugins/gamepads/gamepads.pro index dd60750..97b47fb 100644 --- a/src/plugins/gamepads/gamepads.pro +++ b/src/plugins/gamepads/gamepads.pro @@ -4,4 +4,4 @@ qtConfig(sdl2): SUBDIRS += sdl2 !android: qtConfig(evdev): SUBDIRS += evdev win32: !wince*: SUBDIRS += xinput darwin: !watchos: SUBDIRS += darwin -android: SUBDIRS += android +android: !android-embedded: SUBDIRS += android diff --git a/src/plugins/gamepads/sdl2/qsdlgamepadbackend.cpp b/src/plugins/gamepads/sdl2/qsdlgamepadbackend.cpp index 963676a..1ffba30 100644 --- a/src/plugins/gamepads/sdl2/qsdlgamepadbackend.cpp +++ b/src/plugins/gamepads/sdl2/qsdlgamepadbackend.cpp @@ -38,6 +38,8 @@ #include <QtCore/QDebug> #include <SDL.h> +// Reset bool redefinition from SDL header +#undef bool QT_BEGIN_NAMESPACE |