diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-29 16:12:06 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-29 16:12:06 +0200 |
| commit | f870501469c9165f16c792e1167a8a897a3b0d5a (patch) | |
| tree | a9f6c4e36ab0d244b3f9e58a69f03ae7391c9aec /tests | |
| parent | 3e5a32e9a40916e0bae882ba22b9d2b1131d6326 (diff) | |
| parent | 80ceeeed3c15d307784be66b5dafdc9cfc12b8cb (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
.qmake.conf
src/nfc/doc/src/nfc-index.qdoc
Change-Id: Ie12d3023ff934f6579ae93617c95fc654e85a7f0
Diffstat (limited to 'tests')
4 files changed, 0 insertions, 8 deletions
diff --git a/tests/auto/qbluetoothdevicediscoveryagent/tst_qbluetoothdevicediscoveryagent.cpp b/tests/auto/qbluetoothdevicediscoveryagent/tst_qbluetoothdevicediscoveryagent.cpp index f4ddd8aa..3f9f4bc7 100644 --- a/tests/auto/qbluetoothdevicediscoveryagent/tst_qbluetoothdevicediscoveryagent.cpp +++ b/tests/auto/qbluetoothdevicediscoveryagent/tst_qbluetoothdevicediscoveryagent.cpp @@ -44,9 +44,6 @@ QT_USE_NAMESPACE -Q_DECLARE_METATYPE(QBluetoothDeviceDiscoveryAgent::InquiryType) -Q_DECLARE_METATYPE(QBluetoothDeviceDiscoveryAgent::Error) - /* * Some parts of this test require a remote and discoverable Bluetooth * device. Setting the BT_TEST_DEVICE environment variable will diff --git a/tests/auto/qbluetoothserver/tst_qbluetoothserver.cpp b/tests/auto/qbluetoothserver/tst_qbluetoothserver.cpp index ef460289..d39dde9f 100644 --- a/tests/auto/qbluetoothserver/tst_qbluetoothserver.cpp +++ b/tests/auto/qbluetoothserver/tst_qbluetoothserver.cpp @@ -45,7 +45,6 @@ QT_USE_NAMESPACE #define TEST_SERVICE_UUID "e8e10f95-1a70-4b27-9ccf-02010264e9c8" Q_DECLARE_METATYPE(QBluetooth::SecurityFlags) -Q_DECLARE_METATYPE(QBluetoothServer::Error) // Max time to wait for connection static const int MaxConnectTime = 60 * 1000; // 1 minute in ms diff --git a/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp b/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp index 280dd893..a6e64d20 100644 --- a/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp +++ b/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp @@ -47,8 +47,6 @@ QT_USE_NAMESPACE -Q_DECLARE_METATYPE(QBluetoothDeviceDiscoveryAgent::Error) - // Maximum time to for bluetooth device scan const int MaxScanTime = 5 * 60 * 1000; // 5 minutes in ms diff --git a/tests/auto/qlowenergycharacteristic/tst_qlowenergycharacteristic.cpp b/tests/auto/qlowenergycharacteristic/tst_qlowenergycharacteristic.cpp index de77046e..deebcf21 100644 --- a/tests/auto/qlowenergycharacteristic/tst_qlowenergycharacteristic.cpp +++ b/tests/auto/qlowenergycharacteristic/tst_qlowenergycharacteristic.cpp @@ -42,8 +42,6 @@ #include <QLowEnergyController> #include <QBluetoothLocalDevice> -Q_DECLARE_METATYPE(QBluetoothDeviceDiscoveryAgent::Error) - QT_USE_NAMESPACE // This define must be set if the platform provides access to GATT handles |