diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-07-03 09:23:25 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@digia.com> | 2014-07-03 09:23:25 +0200 |
| commit | f78b5f54d8c7536257629ad39bc300e233584949 (patch) | |
| tree | e919f3f79a97e14fe927e840b2ad845d5ee92ee3 /src/bluetooth/qbluetoothsocket_bluez.cpp | |
| parent | d2c043d9bb1172f37b3d9051b0483c4a0f3a5d05 (diff) | |
| parent | cb6bdcb3fb94a38613304b60724e0cd02962cd14 (diff) | |
Merge branch 'dev' into btle
Conflicts:
src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp
Change-Id: Ib960b9e8d8800af84d2094bdf26c2652d4c81dba
Diffstat (limited to 'src/bluetooth/qbluetoothsocket_bluez.cpp')
| -rw-r--r-- | src/bluetooth/qbluetoothsocket_bluez.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bluetooth/qbluetoothsocket_bluez.cpp b/src/bluetooth/qbluetoothsocket_bluez.cpp index c4d84211..ba99b889 100644 --- a/src/bluetooth/qbluetoothsocket_bluez.cpp +++ b/src/bluetooth/qbluetoothsocket_bluez.cpp @@ -139,7 +139,7 @@ void QBluetoothSocketPrivate::connectToService(const QBluetoothAddress &address, int result = -1; if (socket == -1 && !ensureNativeSocket(socketType)) { - errorString = QObject::tr("Unknown socket error"); + errorString = QBluetoothSocket::tr("Unknown socket error"); q->setSocketError(QBluetoothSocket::UnknownSocketError); return; } |