diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-03 14:20:01 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-04 11:12:05 +0100 |
commit | ca2f44680cb97e7a7c46ee0ab26654822fe65e2d (patch) | |
tree | b9d85ad8ec1b18a6aa56b7657812cf3791bdf72e /src/network/socket/qlocalserver_tcp.cpp | |
parent | 28a21d98ef8d880a6dd86ee19dd803424bb5eae1 (diff) | |
parent | 83188c6499ccdc87c0a2c468bb497e287f5db369 (diff) |
Merge branch 'stable' into dev
Conflicts:
examples/widgets/painting/shared/shared.pri
src/corelib/tools/qharfbuzz_p.h
src/corelib/tools/qunicodetools.cpp
src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp
src/plugins/platforms/windows/qwindowsfontdatabase.cpp
Change-Id: Ibc9860abf570e5ce8b052fb88feb73ec35e64bd3
Diffstat (limited to 'src/network/socket/qlocalserver_tcp.cpp')
-rw-r--r-- | src/network/socket/qlocalserver_tcp.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/network/socket/qlocalserver_tcp.cpp b/src/network/socket/qlocalserver_tcp.cpp index cb727a9d2c..a705b18dc5 100644 --- a/src/network/socket/qlocalserver_tcp.cpp +++ b/src/network/socket/qlocalserver_tcp.cpp @@ -67,7 +67,7 @@ bool QLocalServerPrivate::listen(const QString &requestedServerName) else fullServerName = prefix + requestedServerName; - QSettings settings(QLatin1String("Trolltech"), QLatin1String("Qt")); + QSettings settings(QLatin1String("QtProject"), QLatin1String("Qt")); if (settings.contains(fullServerName)) { qWarning("QLocalServer::listen: server name is already in use."); tcpServer.close(); @@ -87,7 +87,7 @@ bool QLocalServerPrivate::listen(qintptr socketDescriptor) void QLocalServerPrivate::closeServer() { - QSettings settings(QLatin1String("Trolltech"), QLatin1String("Qt")); + QSettings settings(QLatin1String("QtProject"), QLatin1String("Qt")); if (fullServerName == QLatin1String("QLocalServer")) settings.setValue(fullServerName, QVariant()); else @@ -126,7 +126,7 @@ bool QLocalServerPrivate::removeServer(const QString &name) else serverName = prefix + name; - QSettings settings(QLatin1String("Trolltech"), QLatin1String("Qt")); + QSettings settings(QLatin1String("QtProject"), QLatin1String("Qt")); if (settings.contains(serverName)) settings.remove(serverName); |