Merge branch 'master' into test

Conflicts:
	configure
	src/systeminfo/qsystemgeneralinfo.h
	src/systeminfo/qsystemnetworkinfo.cpp
	src/systeminfo/qsystemstorageinfo.cpp
	src/systeminfo/systeminfo.pro

1 files changed, 14 insertions, 1 deletions

diff --git a/tests/auto/qsystemdeviceinfo/tst_qsystemdeviceinfo.cpp b/tests/auto/qsystemdeviceinfo/tst_qsystemdeviceinfo.cpp
index 6eab9c16b1..5409fb91bd 100644
--- a/tests/auto/qsystemdeviceinfo/tst_qsystemdeviceinfo.cpp
+++ b/tests/auto/qsystemdeviceinfo/tst_qsystemdeviceinfo.cpp
@@ -147,6 +147,8 @@ private slots:
 
     void tst_currentPowerState();
 
+    void tst_currentThermalState();
+
     void tst_currentBluetoothPowerState();
 
     void tst_keyboardType();
@@ -358,6 +360,17 @@ void tst_QSystemDeviceInfo::tst_currentPowerState()
 #endif
 }
 
+void tst_QSystemDeviceInfo::tst_currentThermalState()
+{
+    QSystemDeviceInfo di;
+    QSystemDeviceInfo::ThermalState state = di.currentThermalState();
+    QVERIFY( state == QSystemDeviceInfo::UnknownThermal
+             || state == QSystemDeviceInfo::NormalThermal
+             || state == QSystemDeviceInfo::WarningThermal
+             || state == QSystemDeviceInfo::AlertThermal
+             || state == QSystemDeviceInfo::ErrorThermal);
+}
+
 void tst_QSystemDeviceInfo::tst_currentBluetoothPowerState()
 {
     QSystemDeviceInfo di;
@@ -415,7 +428,7 @@ void tst_QSystemDeviceInfo::tst_keypadLightOn()
 void tst_QSystemDeviceInfo::tst_uniqueDeviceID()
 {
     QSystemDeviceInfo di;
-    QUuid id = di.uniqueDeviceID();
+    QByteArray id = di.uniqueDeviceID();
     QVERIFY(id.isNull()|| !id.isNull());
 }