Merge branch 'stable' into releaseQtEE_v3.0.0

* stable: (25 commits)
  Add notes about Quick Compiler failures
  doc: Updated versions and supported platforms
  doc: Updated links to Qt EE known issues and product page
  Doc: Warn the user that his Nexus will be wiped.
  doc: move adb connection change info to customization
  Build wifi also on eLinux
  Don't show Wi-Fi group box on iMX6-eAndroid
  Fix class names for WebEngine
  Doc: add note about webengine's widget apis
  Doc: add change log for version 3.0.0
  doc: include sabre sd documentation
  Doc: Add setup instructions for Nexus 7 (2013)
  Set initial "backend ready" state.
  Port QtWifi to eLinux
  Add a note about webengine and emulator
  Doc: Update version
  Doc: Add table with all possible MACHINE values
  Doc: QT_QPA_EVDEV_TOUCHSCREEN_PARAMETERS replaces QT_QPA_GENERIC_PLUGINS
  Doc: Use precise naming for Boundary Devices i.MX6
  Add PowerManager service.
  ...

Change-Id: I2762dfe023d461b677d7ed748c33444145d35175

1 files changed, 2 insertions, 1 deletions

diff --git a/src/utils/qdroidutils.cpp b/src/utils/qdroidutils.cpp
index 7ab2098..d880de9 100644
--- a/src/utils/qdroidutils.cpp
+++ b/src/utils/qdroidutils.cpp
@@ -29,6 +29,7 @@
 #include <cutils/properties.h>
 #include <hardware/lights.h>
 #include <media/AudioSystem.h>
+#include <utils/String8.h>
 #endif
 
 /*!
@@ -225,7 +226,7 @@ bool QDroidUtils::setDisplayBrightness(quint8 value)
 QString QDroidUtils::getIPAddress()
 {
     QStringList addresses;
-    QNetworkInterface interface = QNetworkInterface::interfaceFromName("eth0");
+    QNetworkInterface interface = QNetworkInterface::interfaceFromName(QStringLiteral("eth0"));
     QList<QNetworkAddressEntry> entries;
     entries = interface.addressEntries();
     foreach (const QNetworkAddressEntry &entry, entries) {