diff options
Diffstat (limited to 'src/imports/nfc/plugin.cpp')
-rw-r--r-- | src/imports/nfc/plugin.cpp | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/imports/nfc/plugin.cpp b/src/imports/nfc/plugin.cpp index 53febda2..3a6806fa 100644 --- a/src/imports/nfc/plugin.cpp +++ b/src/imports/nfc/plugin.cpp @@ -47,13 +47,6 @@ #include "qdeclarativendefurirecord_p.h" #include "qdeclarativendefmimerecord_p.h" -static void initResources() -{ -#ifdef QT_STATIC - Q_INIT_RESOURCE(qmake_QtNfc); -#endif -} - QT_USE_NAMESPACE class QNfcQmlPlugin : public QQmlExtensionPlugin @@ -62,7 +55,7 @@ class QNfcQmlPlugin : public QQmlExtensionPlugin Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: - QNfcQmlPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } + QNfcQmlPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { } void registerTypes(const char *uri) { Q_ASSERT(uri == QStringLiteral("QtNfc")); @@ -98,10 +91,9 @@ public: minor = 5; qmlRegisterType<QDeclarativeNearField, 1>(uri, major, minor, "NearField"); - // Register the 5.6 - 5.9 types - minor = 9; - qmlRegisterType<QDeclarativeNearField, 1>(uri, major, minor, "NearField"); + // Register the latest Qt version as QML type version + qmlRegisterModule(uri, QT_VERSION_MAJOR, QT_VERSION_MINOR); } }; |