diff options
| author | Kalle Viironen <kalle.viironen@digia.com> | 2014-02-03 13:35:58 +0200 |
|---|---|---|
| committer | Kalle Viironen <kalle.viironen@digia.com> | 2014-02-03 13:36:10 +0200 |
| commit | 3767236b994a540cd7703b0b6ba9ba9dc3f5093e (patch) | |
| tree | 14245ddcdce10d72443620384ec2f0f922ae1645 /src/utils | |
| parent | 59649939d06664d722046cd54e0933c5b402e9a9 (diff) | |
| parent | 711bfedc706f609cce586406647cfb4ef4547f15 (diff) | |
Merge branch 'dev' into stable
Change-Id: Id400a6ef329013e7a862f7cddd79a84a6967dbae
Diffstat (limited to 'src/utils')
| -rw-r--r-- | src/utils/qdroidutils.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/utils/qdroidutils.cpp b/src/utils/qdroidutils.cpp index 2a9c94c..0952345 100644 --- a/src/utils/qdroidutils.cpp +++ b/src/utils/qdroidutils.cpp @@ -19,6 +19,7 @@ #include "qdroidutils.h" #include <unistd.h> #include <QDebug> +#include <math.h> #ifdef Q_OS_ANDROID_NO_SDK #include <cutils/android_reboot.h> @@ -228,22 +229,22 @@ bool QDroidUtils::setDisplayBrightness(quint8 value) /*! - * Gets the current IP address of the device + * Gets the current IP address(es) of the device */ QString QDroidUtils::getIPAddress() { - QString address; + QStringList addresses; #ifdef Q_OS_ANDROID_NO_SDK qDebug("QDroidUtils::getIPAddress()"); #else QNetworkInterface interface = QNetworkInterface::interfaceFromName("eth0"); QList<QNetworkAddressEntry> entries; entries = interface.addressEntries(); - if ( !entries.empty() ) { - address = entries.first().ip().toString(); + foreach (const QNetworkAddressEntry &entry, entries) { + addresses.append(entry.ip().toString().split('%').first()); } #endif - return address; + return addresses.join(QStringLiteral(", ")); } /*! |