diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-05-08 09:51:40 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@digia.com> | 2014-05-08 09:51:40 +0200 |
| commit | 94445dd4b9a6754a63736a05b9bccaaffc0a4038 (patch) | |
| tree | fedeb79f2a583da4935fcd8fc5f70298812c056d /src/imports/nfc | |
| parent | 74449f1b0b2952dcbad9525c167b36fbf908696f (diff) | |
| parent | ef7de5da3d4d2346ec7110413c8fb12db8c94013 (diff) | |
Merge branch 'stable' into dev
Conflicts:
.qmake.conf
src/bluetooth/qbluetoothlocaldevice_bluez.cpp
src/bluetooth/qbluetoothserver_p.h
src/bluetooth/qbluetoothsocket_qnx.cpp
Change-Id: I08792f10155f9b4e6af30066b70e24b48985ddd6
Diffstat (limited to 'src/imports/nfc')
| -rw-r--r-- | src/imports/nfc/qmldir | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/imports/nfc/qmldir b/src/imports/nfc/qmldir index 3afa926d..0025f3e6 100644 --- a/src/imports/nfc/qmldir +++ b/src/imports/nfc/qmldir @@ -1,3 +1,4 @@ module QtNfc plugin declarative_nfc +classname QNfcQmlPlugin typeinfo plugins.qmltypes |