diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2015-05-27 09:21:08 +0400 |
|---|---|---|
| committer | Konstantin Ritt <ritt.ks@gmail.com> | 2015-06-23 08:22:31 +0000 |
| commit | acaab9e6425726d7a3901e6224c6e59874bc5a62 (patch) | |
| tree | 443521d372c2be777626000d26d52e834a661838 /tests | |
| parent | 3acd1a5d4fc4dc501d8b0a149909511e91aafb05 (diff) | |
Port from Q_ENUMS to new macro Q_ENUM
Remove Q_ENUMS in favor of the new Q_ENUM macro which provides
registration as meta enum and a debug stream operator.
Register some enums via Q_ENUM to improve debug output
and types auto-registration.
Change-Id: I31c9535a2de7da1783b4ec967612c02a57cb62ff
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
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 |