diff options
| author | Lorn Potter <lorn.potter@nokia.com> | 2010-12-14 09:48:07 +1000 |
|---|---|---|
| committer | Lorn Potter <lorn.potter@nokia.com> | 2010-12-14 09:48:07 +1000 |
| commit | 8347f03d32cfbf5a1795af9059614098be2fa85a (patch) | |
| tree | 7d1f1f0c6ea3e0d91b965bc24496cced1e9324f9 /tests/auto/qsystemdeviceinfo/tst_qsystemdeviceinfo.cpp | |
| parent | 6215da1339d090bb7fdd018b44e9b6cd450aebc5 (diff) | |
| parent | d93fa5ee71a945e43669720e98b9b9420c8012d6 (diff) | |
Merge branch 'master' into test
Conflicts:
src/systeminfo/systeminfo.pro
tests/auto/qsystemnetworkinfo/tst_qsystemnetworkinfo.cpp
Diffstat (limited to 'tests/auto/qsystemdeviceinfo/tst_qsystemdeviceinfo.cpp')
| -rw-r--r-- | tests/auto/qsystemdeviceinfo/tst_qsystemdeviceinfo.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tests/auto/qsystemdeviceinfo/tst_qsystemdeviceinfo.cpp b/tests/auto/qsystemdeviceinfo/tst_qsystemdeviceinfo.cpp index 21561dd7eb..1b392165f9 100644 --- a/tests/auto/qsystemdeviceinfo/tst_qsystemdeviceinfo.cpp +++ b/tests/auto/qsystemdeviceinfo/tst_qsystemdeviceinfo.cpp @@ -368,8 +368,13 @@ void tst_QSystemDeviceInfo::tst_keyboardType() || (flags && QSystemDeviceInfo::SoftwareKeyboard == QSystemDeviceInfo::SoftwareKeyboard) || (flags && QSystemDeviceInfo::ITUKeypad == QSystemDeviceInfo::ITUKeypad) || (flags && QSystemDeviceInfo::HalfQwertyKeyboard == QSystemDeviceInfo::HalfQwertyKeyboard) - || (flags && QSystemDeviceInfo::FullQwertyKeyboard == QSystemDeviceInfo::FullQwertyKeyboard) - || (flags && QSystemDeviceInfo::WirelessKeyboard == QSystemDeviceInfo::WirelessKeyboard)); + || (flags && QSystemDeviceInfo::FullQwertyKeyboard == QSystemDeviceInfo::FullQwertyKeyboard)); + + if(di.isWirelessKeyboardConnected()) { + QVERIFY((flags & QSystemDeviceInfo::WirelessKeyboard)); + } else { + QVERIFY((flags & ~QSystemDeviceInfo::WirelessKeyboard)); + } } void tst_QSystemDeviceInfo::tst_isWirelessKeyboardConnected() |