diff options
| author | Aaron McCarthy <mccarthy.aaron@gmail.com> | 2012-10-01 13:28:16 +1000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-01 12:04:55 +0200 |
| commit | f3d8f66116af4319650d8f3e7ca069275fdfa780 (patch) | |
| tree | 2b7dc73c029adfdf0302409a2422b3df4d9e5c54 /src/imports/nfc/plugin.cpp | |
| parent | 3f4a920f87842e1bbb20f72ce04d6da7a866ab1d (diff) | |
Further porting of NFC module from mobility to Qt 5.
Includes the following changes:
* Conditionally enables building of the NFC module when qmake is
run with CONFIG+=nfc.
* Correctly build within the QtNfc namespace.
* Fix compile errors in examples, enable building of NFC examples.
* Fix compile errors in tests, enable building of NFC tests.
Mark the some NFC tests as insignificant as they currently crash.
Notably does not enable NFC documentation generation.
Task-number: QTBUG-22015
Change-Id: I9ff170c45848c8f0215e9427797922f840c2f015
Reviewed-by: Alex <ablasche@gmail.com>
Diffstat (limited to 'src/imports/nfc/plugin.cpp')
| -rw-r--r-- | src/imports/nfc/plugin.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/imports/nfc/plugin.cpp b/src/imports/nfc/plugin.cpp index 76c98836..3a42d181 100644 --- a/src/imports/nfc/plugin.cpp +++ b/src/imports/nfc/plugin.cpp @@ -39,12 +39,10 @@ ** ****************************************************************************/ +#include <QtQml/QQmlEngine> +#include <QtQml/QQmlExtensionPlugin> -#include <QtDeclarative/QDeclarativeEngine> -#include <QtDeclarative/QDeclarativeExtensionPlugin> - -#include <qdeclarativendefrecord.h> - +#include "qdeclarativendefrecord.h" #include "qdeclarativenearfieldsocket_p.h" #include "qdeclarativenearfield_p.h" #include "qdeclarativendeffilter_p.h" @@ -54,15 +52,19 @@ QT_USE_NAMESPACE -class QNfcQmlPlugin : public QDeclarativeExtensionPlugin +class QNfcQmlPlugin : public QQmlExtensionPlugin { Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface") + public: void registerTypes(const char *uri) { Q_ASSERT(uri == QLatin1String("QtNfc")); + // @uri QtNfc + int major = 5; int minor = 0; qmlRegisterType<QDeclarativeNearFieldSocket>(uri, major, minor, "NearFieldSocket"); |