diff options
author | Lorn Potter <lorn.potter@nokia.com> | 2010-12-17 09:50:40 +1000 |
---|---|---|
committer | Lorn Potter <lorn.potter@nokia.com> | 2010-12-17 09:50:40 +1000 |
commit | 7a66236d0da3ea26bfe6622d703b23b9ec9936f0 (patch) | |
tree | 4fd8641171cf62ff0e3427fa665ebdad836879bb /tests/auto/qsystemdeviceinfo/tst_qsystemdeviceinfo.cpp | |
parent | ade7f991ff8a65f26fe766489e1f736c63f1feb2 (diff) |
clarify LockTypes
Diffstat (limited to 'tests/auto/qsystemdeviceinfo/tst_qsystemdeviceinfo.cpp')
-rw-r--r-- | tests/auto/qsystemdeviceinfo/tst_qsystemdeviceinfo.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/tests/auto/qsystemdeviceinfo/tst_qsystemdeviceinfo.cpp b/tests/auto/qsystemdeviceinfo/tst_qsystemdeviceinfo.cpp index 1b64061c6b..cf04e10301 100644 --- a/tests/auto/qsystemdeviceinfo/tst_qsystemdeviceinfo.cpp +++ b/tests/auto/qsystemdeviceinfo/tst_qsystemdeviceinfo.cpp @@ -110,7 +110,7 @@ void tst_QSystemDeviceInfo::initTestCase() qRegisterMetaType<QSystemDeviceInfo::SimStatus>("QSystemDeviceInfo::SimStatus"); qRegisterMetaType<QSystemDeviceInfo::KeyboardTypeFlags>("QSystemDeviceInfo::KeyboardTypeFlags"); - qRegisterMetaType<QSystemDeviceInfo::LockType>("QSystemDeviceInfo::LockType"); + qRegisterMetaType<QSystemDeviceInfo::LockTypeFlags>("QSystemDeviceInfo::LockTypeFlags"); } @@ -302,12 +302,11 @@ void tst_QSystemDeviceInfo::tst_uniqueID() void tst_QSystemDeviceInfo::tst_lockStatus() { QSystemDeviceInfo di; - QSystemDeviceInfo::LockType lock = di.lockStatus(); + QSystemDeviceInfo::LockTypeFlags lock = di.lockStatus(); if (di.isDeviceLocked()) { - QVERIFY((lock == QSystemDeviceInfo::DeviceLocked) - || (lock == QSystemDeviceInfo::TouchAndKeyboardLocked)); - } else { - QVERIFY( lock == QSystemDeviceInfo::UnknownLock); + QVERIFY((lock & QSystemDeviceInfo::PinLocked) + || (lock & QSystemDeviceInfo::TouchAndKeyboardLocked) + || (lock & QSystemDeviceInfo::UnknownLock)); } } |