Merge remote-tracking branch 'upstream/master' into support_for_philips_hue

Former-commit-id: 51089fb3522bf9c228d67f2c2f9a1a5b33e5d0a5
This commit is contained in:
ntim
2016-01-18 10:36:20 +01:00
41 changed files with 776 additions and 74 deletions

View File

@@ -8,7 +8,6 @@
#include <QString>
#include <QNetworkAccessManager>
#include <QTimer>
// Leddevice includes
#include <leddevice/LedDevice.h>
@@ -165,7 +164,7 @@ private:
/// User name for the API ("newdeveloper")
QString username;
/// QNetworkAccessManager object for sending requests.
QNetworkAccessManager* manager;
QNetworkAccessManager* manager;
/// Use timer to reset lights when we got into "GRABBINGMODE_OFF".
QTimer timer;
///