diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-02-17 10:38:48 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@digia.com> | 2014-02-17 10:38:48 +0100 |
| commit | 8fe7fbe6b552b0d196967cfea85fede5e7c211b9 (patch) | |
| tree | b90f246cc3b8847cedaf6b5f8dc045cfc563b9be /src/imports/bluetooth/plugins.qmltypes | |
| parent | 9bcb79f0c741f7805dad17c467a5c2041227a18a (diff) | |
| parent | b4bde05d8459cc57c25bac3f7be19fcf03908606 (diff) | |
Merge branch 'dev' into btle
Conflicts:
examples/bluetooth/bluetooth.pro
src/bluetooth/doc/src/examples.qdoc
src/bluetooth/qbluetoothdevicediscoveryagent_qnx.cpp
src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp
src/bluetooth/qbluetoothservicediscoveryagent_p.h
src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp
Change-Id: Ie1577e4b0f469cd5a6b05a61cbe94f180a64448d
Diffstat (limited to 'src/imports/bluetooth/plugins.qmltypes')
| -rw-r--r-- | src/imports/bluetooth/plugins.qmltypes | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/imports/bluetooth/plugins.qmltypes b/src/imports/bluetooth/plugins.qmltypes index 20d57574..18647c2c 100644 --- a/src/imports/bluetooth/plugins.qmltypes +++ b/src/imports/bluetooth/plugins.qmltypes @@ -4,7 +4,7 @@ import QtQuick.tooling 1.1 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -notrelocatable QtBluetooth 5.2' +// 'qmlplugindump -notrelocatable QtBluetooth 5.3' Module { Component { @@ -12,9 +12,10 @@ Module { prototype: "QAbstractListModel" exports: [ "QtBluetooth/BluetoothDiscoveryModel 5.0", - "QtBluetooth/BluetoothDiscoveryModel 5.2" + "QtBluetooth/BluetoothDiscoveryModel 5.2", + "QtBluetooth/BluetoothDiscoveryModel 5.3" ] - exportMetaObjectRevisions: [0, 0] + exportMetaObjectRevisions: [0, 0, 0] Enum { name: "DiscoveryMode" values: { |