diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-12 12:53:13 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-12 12:53:13 +0200 |
| commit | aa3754d1058c08b18dc5c3f38ca9496ce152c584 (patch) | |
| tree | f2df5de02aab5d82a75e63c54f1bb9882ff89583 /src/network | |
| parent | a12a67c820fb010bc0396233528d652b717842e6 (diff) | |
| parent | 8c81b282f8e18897257b93cb3fc149d74441c40e (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Iee73c93067c5822d8dd51a8692e6da9df4ba49f5
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/socket/qlocalsocket_tcp.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/socket/qlocalsocket_tcp.cpp b/src/network/socket/qlocalsocket_tcp.cpp index edde5a4687..31aaa6e1c5 100644 --- a/src/network/socket/qlocalsocket_tcp.cpp +++ b/src/network/socket/qlocalsocket_tcp.cpp @@ -234,7 +234,7 @@ bool QLocalSocket::open(OpenMode openMode) } const QLatin1String prefix("QLocalServer/"); - if (name.startsWith(prefix)) + if (d->serverName.startsWith(prefix)) d->fullServerName = d->serverName; else d->fullServerName = prefix + d->serverName; |