From 0df026de86a885a7b0acb9138edab14db31d63f7 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Sun, 2 Dec 2012 17:24:19 +0100 Subject: Stop using the name "Trolltech" in QSettings Also change Trolltech for QtProject in other places Task-number: QTBUG-23269 Change-Id: Ie4e344f23cab77c575562d18b481b3369ce30491 Reviewed-by: Thiago Macieira Reviewed-by: Lars Knoll --- src/network/socket/qlocalserver_tcp.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/network/socket/qlocalserver_tcp.cpp') 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); -- cgit v1.2.3