diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/imports/gamepad/qtgamepad.cpp | 9 | ||||
| -rw-r--r-- | src/plugins/gamepads/darwin/qdarwingamepadbackend.mm | 16 |
3 files changed, 9 insertions, 18 deletions
diff --git a/.qmake.conf b/.qmake.conf index 09d37b2..bc074d5 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.11.2 +MODULE_VERSION = 5.12.0 diff --git a/src/imports/gamepad/qtgamepad.cpp b/src/imports/gamepad/qtgamepad.cpp index 3b81dec..f3f6439 100644 --- a/src/imports/gamepad/qtgamepad.cpp +++ b/src/imports/gamepad/qtgamepad.cpp @@ -43,13 +43,6 @@ #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 */) @@ -64,7 +57,7 @@ class QGamepadModule : public QQmlExtensionPlugin Q_OBJECT Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: - QGamepadModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } + QGamepadModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { } void registerTypes(const char *uri) { Q_ASSERT(QLatin1String(uri) == QLatin1String("QtGamepad")); diff --git a/src/plugins/gamepads/darwin/qdarwingamepadbackend.mm b/src/plugins/gamepads/darwin/qdarwingamepadbackend.mm index 1298c00..5c07271 100644 --- a/src/plugins/gamepads/darwin/qdarwingamepadbackend.mm +++ b/src/plugins/gamepads/darwin/qdarwingamepadbackend.mm @@ -40,23 +40,21 @@ #import <GameController/GameController.h> @interface QT_MANGLE_NAMESPACE(DarwinGamepadManager) : NSObject -{ - QDarwinGamepadBackend *backend; - NSMutableArray *connectedControllers; -} @property (nonatomic, strong) id connectObserver; @property (nonatomic, strong) id disconnectObserver; --(void)addMonitoredController:(GCController *)controller; --(void)removeMonitoredController:(GCController *)controller; - @end @implementation QT_MANGLE_NAMESPACE(DarwinGamepadManager) +{ + QDarwinGamepadBackend *backend; + NSMutableArray *connectedControllers; +} --(id)initWithBackend:(QDarwinGamepadBackend *)gamepadBackend { - if (self = [super init]) { +-(instancetype)initWithBackend:(QDarwinGamepadBackend *)gamepadBackend +{ + if ((self = [self init])) { backend = gamepadBackend; connectedControllers = [[NSMutableArray alloc] init]; //Setup observers for monitoring controller connections/disconnections |