From d35a7d2901e6d2f2bec4669fb610104e02abfa53 Mon Sep 17 00:00:00 2001
From: aavit <eirik.aavitsland@digia.com>
Date: Mon, 18 Mar 2013 11:40:00 +0100
Subject: Update to new #define platform flag: Q_OS_ANDROID_NO_SDK

Also, do just qWarning instead of qFatal (process terminate)
if reboot/poweroff() returns.
---
 src/utils/qdroidutils.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/utils')

diff --git a/src/utils/qdroidutils.cpp b/src/utils/qdroidutils.cpp
index 4004352..695edb7 100644
--- a/src/utils/qdroidutils.cpp
+++ b/src/utils/qdroidutils.cpp
@@ -1,6 +1,6 @@
 #include "qdroidutils.h"
 
-#ifdef Q_OS_LINUX_ANDROID
+#ifdef Q_OS_ANDROID_NO_SDK
 #include <cutils/android_reboot.h>
 #include <hardware/lights.h>
 #endif
@@ -12,9 +12,9 @@
  */
 void QDroidUtils::rebootSystem()
 {
-#ifdef Q_OS_LINUX_ANDROID
+#ifdef Q_OS_ANDROID_NO_SDK
     (void)android_reboot(ANDROID_RB_RESTART, 0, 0);
-    qFatal("android_reboot returned");
+    qWarning("android_reboot returned");
 #else
     qDebug("QDroidUtils::rebootSystem()");
 #endif
@@ -27,9 +27,9 @@ void QDroidUtils::rebootSystem()
  */
 void QDroidUtils::powerOffSystem()
 {
-#ifdef Q_OS_LINUX_ANDROID
+#ifdef Q_OS_ANDROID_NO_SDK
     (void)android_reboot(ANDROID_RB_POWEROFF, 0, 0);
-    qFatal("android_reboot returned");
+    qWarning("android_reboot returned");
 #else
     qDebug("QDroidUtils::powerOffSystem()");
 #endif
@@ -45,7 +45,7 @@ void QDroidUtils::powerOffSystem()
 //### TBD: add the user/sensor setting as parameter!
 bool QDroidUtils::setDisplayBrightness(quint8 value)
 {
-#ifdef Q_OS_LINUX_ANDROID
+#ifdef Q_OS_ANDROID_NO_SDK
     const struct hw_module_t* module = 0;
     if (hw_get_module(LIGHTS_HARDWARE_MODULE_ID, &module))
         return false;
-- 
cgit v1.2.3