diff options
| author | aavit <eirik.aavitsland@digia.com> | 2013-03-18 11:40:00 +0100 |
|---|---|---|
| committer | aavit <eirik.aavitsland@digia.com> | 2013-03-18 11:40:00 +0100 |
| commit | d35a7d2901e6d2f2bec4669fb610104e02abfa53 (patch) | |
| tree | 5d4ac55eceddf340ff8f21818603dca1d2492e43 /src/utils | |
| parent | 9408807bb0fd7a9a83531241a8e7b8f8d9d76dd1 (diff) | |
Update to new #define platform flag: Q_OS_ANDROID_NO_SDK
Also, do just qWarning instead of qFatal (process terminate)
if reboot/poweroff() returns.
Diffstat (limited to 'src/utils')
| -rw-r--r-- | src/utils/qdroidutils.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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; |