Merge pull request #445 from frostworx/master

added optional QT5 support - LedDevicePhilipsHue needs proper fixes

Former-commit-id: a9b0dd2af92266ad137c4a3ac05dbeec6a6c102b
This commit is contained in:
tvdzwan
2016-01-13 22:43:15 +01:00
24 changed files with 214 additions and 9 deletions

View File

@@ -59,8 +59,11 @@ void BoblightClientConnection::readData()
while(bytes > 0)
{
// create message string (strip the newline)
#ifdef ENABLE_QT5
QString message = QString::fromLatin1(_receiveBuffer.data(), bytes-1);
#else
QString message = QString::fromAscii(_receiveBuffer.data(), bytes-1);
#endif
// remove message data from buffer
_receiveBuffer = _receiveBuffer.mid(bytes);