diff options
| author | Eirik Aavitsland <eirik.aavitsland@theqtcompany.com> | 2015-06-16 13:39:16 +0200 |
|---|---|---|
| committer | Eirik Aavitsland <eirik.aavitsland@theqtcompany.com> | 2015-06-16 14:56:15 +0300 |
| commit | 0e0f5e8bb841c588d323b76042c970745d0904c6 (patch) | |
| tree | 298980932d70a033c17353c621cc1a3e90b7aa40 /src | |
| parent | cadbdc0708bdf8779caf1e55e1e2b9ac742bcbe6 (diff) | |
Fix qtlauncher settings app setting display brightness to 0
Qt Quick, like C++, really doesn't grok the quint8 type - since it's
just a char underneath, it now is sometimes interpreted as a string.
Fix by just sticking with straight int instead, which arguably is
anyway a better (more flexible) api choice.
Change-Id: I04e3324d2ecab54860eb6c2ee2e4337ccfd4ecb4
Reviewed-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/utils/b2qtdevice.cpp | 5 | ||||
| -rw-r--r-- | src/utils/b2qtdevice.h | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/utils/b2qtdevice.cpp b/src/utils/b2qtdevice.cpp index 689b01f..da55a81 100644 --- a/src/utils/b2qtdevice.cpp +++ b/src/utils/b2qtdevice.cpp @@ -122,8 +122,9 @@ static void initLightDevices() * * Returns true on success. */ -bool B2QtDevice::setDisplayBrightness(quint8 value) +bool B2QtDevice::setDisplayBrightness(int v) { + quint8 value = qBound(0, v, 255); #ifdef Q_OS_ANDROID_NO_SDK const struct hw_module_t* module = 0; if (hw_get_module(LIGHTS_HARDWARE_MODULE_ID, &module)) @@ -166,7 +167,7 @@ bool B2QtDevice::setDisplayBrightness(quint8 value) * Returns the current backlight intensity. * \sa setDisplayBrightness */ -quint8 B2QtDevice::displayBrightness() const +int B2QtDevice::displayBrightness() const { #ifdef Q_OS_ANDROID_NO_SDK QFile sysFile(QStringLiteral("/sys/class/leds/lcd-backlight/brightness")); diff --git a/src/utils/b2qtdevice.h b/src/utils/b2qtdevice.h index 0563e3f..952f67a 100644 --- a/src/utils/b2qtdevice.h +++ b/src/utils/b2qtdevice.h @@ -25,7 +25,7 @@ class Q_DECL_EXPORT B2QtDevice : public QObject { Q_OBJECT - Q_PROPERTY(quint8 displayBrightness READ displayBrightness WRITE setDisplayBrightness NOTIFY displayBrightnessChanged) + Q_PROPERTY(int displayBrightness READ displayBrightness WRITE setDisplayBrightness NOTIFY displayBrightnessChanged) Q_PROPERTY(QString hostname READ hostname WRITE setHostname NOTIFY hostnameChanged) Q_PROPERTY(QString ipAddress READ getIPAddress NOTIFY ipAddressChanged) Q_PROPERTY(int masterVolume READ masterVolume WRITE setMasterVolume NOTIFY masterVolumeChanged) @@ -34,7 +34,7 @@ public: B2QtDevice(QObject *parent = 0); ~B2QtDevice(); - quint8 displayBrightness() const; + int displayBrightness() const; QString hostname() const; QString getIPAddress() const; int masterVolume() const; @@ -45,12 +45,12 @@ public Q_SLOTS: void reboot(); void powerOff(); - bool setDisplayBrightness(quint8 value); + bool setDisplayBrightness(int value); bool setHostname(const QString &name); void setMasterVolume(int volume); signals: - void displayBrightnessChanged(quint8 newValue); + void displayBrightnessChanged(int newValue); void hostnameChanged(const QString &newName); void ipAddressChanged(const QString &newAddress); void masterVolumeChanged(int newVolume); |