Merge branch 'master' into test

Conflicts:
	tests/auto/qsystemdeviceinfo/tst_qsystemdeviceinfo.cpp

1 files changed, 2 insertions, 2 deletions

diff --git a/tests/auto/qsystemdeviceinfo/tst_qsystemdeviceinfo.cpp b/tests/auto/qsystemdeviceinfo/tst_qsystemdeviceinfo.cpp
index 6a109c0194..471931773a 100644
--- a/tests/auto/qsystemdeviceinfo/tst_qsystemdeviceinfo.cpp
+++ b/tests/auto/qsystemdeviceinfo/tst_qsystemdeviceinfo.cpp
@@ -394,7 +394,7 @@ void tst_QSystemDeviceInfo::tst_isWirelessKeyboardConnected()
 void tst_QSystemDeviceInfo::tst_isKeyboardFlipOpen()
 {
     QSystemDeviceInfo di;
-    bool on = di.isKeyboardFlipOpen();
+    bool on = di.isKeyboardFlippedOpen();
     QVERIFY(on || !on);
 }
 
@@ -412,7 +412,7 @@ void tst_QSystemDeviceInfo::tst_keypadLightOn()
 void tst_QSystemDeviceInfo::tst_uniqueID()
 {
     QSystemDeviceInfo di;
-    QUuid id = di.uniqueID();
+    QUuid id = di.uniqueDeviceID();
     QVERIFY(id.isNull()|| !id.isNull());
 }