AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stop using the name "Trolltech" in QSettings

Browse Source 
Also change Trolltech for QtProject in other places

Task-number: QTBUG-23269
Change-Id: Ie4e344f23cab77c575562d18b481b3369ce30491
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
This commit is contained in:
Sergio Ahumada 2012-12-02 17:24:19 +01:00 committed by The Qt Project
parent 0d40958347
commit 0df026de86
13 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mkspecs/devices/linux-imx6-g++/qmake.conf
View File

@ -8,7 +8,7 @@
# /home/tsenyk/qt5/qt5/configure -opensource -confirm-license -make libs -device imx6 \
# -device-option CROSS_COMPILE=/opt/freescale/usr/local/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/arm-fsl-linux-gnueabi- \
# -sysroot <path-to-your-ltib-install>/rootfs -no-gcc-sysroot \
# -prefix /usr/local/Trolltech/Qt5-imx6-1
# -prefix /usr/local/Qt-5.0.0/Qt5-imx6-1
#
# NOTE: currently ltib doesn't produce a proper staging/sysroot-filessystem.
# If gcc's --sysroot is used, the toolchain doesn't find basic binaries (e.g. crt1.o),

2
mkspecs/devices/linux-tegra2-g++/qmake.conf
View File

@ -4,7 +4,7 @@
# This mkspec is based and tested on the TrimSlice using "Ubuntu Natty (11.04) - l4t.r15.01"-release.
# It might work with other boards and releases as well.
# A typical configure line looks like this:
# <path-to-qt-src>/configure -opensource -confirm-license -make libs -prefix /usr/local/Trolltech/Qt5-tegra2
# <path-to-qt-src>/configure -opensource -confirm-license -make libs -prefix /usr/local/Qt-5.0.0/Qt5-tegra2
# -device tegra2 -device-option CROSS_COMPILE=<path-to-crosstoolchain>/bin/arm-none-linux-gnueabi- \
# -sysroot <path-to-rootfs> -no-neon

2
qmake/property.cpp
View File

@ -105,7 +105,7 @@ QMakeProperty::~QMakeProperty()
void QMakeProperty::initSettings()
{
if(!settings) {
settings = new QSettings(QSettings::UserScope, "Trolltech", "QMake");
settings = new QSettings(QSettings::UserScope, "QtProject", "QMake");
settings->setFallbacksEnabled(false);
}
}

4
src/gui/kernel/qplatformdialoghelper.cpp
View File

@ -205,7 +205,7 @@ QColorDialogStaticData::QColorDialogStaticData() : customSet(false)
void QColorDialogStaticData::readSettings()
{
#ifndef QT_NO_SETTINGS
const QSettings settings(QSettings::UserScope, QStringLiteral("Trolltech"));
const QSettings settings(QSettings::UserScope, QStringLiteral("QtProject"));
for (int i = 0; i < int(CustomColorCount); ++i) {
const QVariant v = settings.value(QStringLiteral("Qt/customColors/") + QString::number(i));
if (v.isValid())
@ -218,7 +218,7 @@ void QColorDialogStaticData::writeSettings() const
{
#ifndef QT_NO_SETTINGS
if (!customSet) {
QSettings settings(QSettings::UserScope, QStringLiteral("Trolltech"));
QSettings settings(QSettings::UserScope, QStringLiteral("QtProject"));
for (int i = 0; i < int(CustomColorCount); ++i)
settings.setValue(QStringLiteral("Qt/customColors/") + QString::number(i), customRgb[i]);
}

6
src/network/socket/qlocalserver_tcp.cpp
View File

@ -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);

2
src/network/socket/qlocalsocket_tcp.cpp
View File

@ -238,7 +238,7 @@ void QLocalSocket::connectToServer(const QString &name, OpenMode openMode)
else
d->fullServerName = prefix + name;
QSettings settings(QLatin1String("Trolltech"), QLatin1String("Qt"));
QSettings settings(QLatin1String("QtProject"), QLatin1String("Qt"));
bool ok;
const quint16 port = settings.value(d->fullServerName).toUInt(&ok);
if (!ok) {

4
src/widgets/dialogs/qfiledialog.cpp
View File

@ -363,7 +363,7 @@ QFileDialog::QFileDialog(const QFileDialogArgs &args)
QFileDialog::~QFileDialog()
{
#ifndef QT_NO_SETTINGS
QSettings settings(QSettings::UserScope, QLatin1String("Trolltech"));
QSettings settings(QSettings::UserScope, QLatin1String("QtProject"));
settings.beginGroup(QLatin1String("Qt"));
settings.setValue(QLatin1String("filedialog"), saveState());
#endif
@ -2229,7 +2229,7 @@ void QFileDialogPrivate::init(const QString &directory, const QString &nameFilte
q->setFileMode(QFileDialog::AnyFile);
#ifndef QT_NO_SETTINGS
QSettings settings(QSettings::UserScope, QLatin1String("Trolltech"));
QSettings settings(QSettings::UserScope, QLatin1String("QtProject"));
settings.beginGroup(QLatin1String("Qt"));
if (!directory.isEmpty())
setLastVisitedDirectory(workingDirectory(directory));

8
tests/auto/corelib/io/qsettings/tst_qsettings.cpp
View File

@ -650,12 +650,12 @@ void tst_QSettings::testByteArray()
// write
{
QSettings settings("Trolltech", "tst_qsettings");
QSettings settings("QtProject", "tst_qsettings");
settings.setValue("byteArray", data);
}
// read
{
QSettings settings("Trolltech", "tst_qsettings");
QSettings settings("QtProject", "tst_qsettings");
QByteArray ret = settings.value("byteArray", data).toByteArray();
QCOMPARE(ret, data);
}
@ -1896,7 +1896,7 @@ void tst_QSettings::testEmptyData()
}
{
QSettings settings("Trolltech", "tst_qsettings");
QSettings settings("QtProject", "tst_qsettings");
settings.setValue("nullString", nullString);
settings.setValue("emptyString", emptyString);
settings.setValue("emptyList", emptyList);
@ -1909,7 +1909,7 @@ void tst_QSettings::testEmptyData()
QVERIFY(settings.status() == QSettings::NoError);
}
{
QSettings settings("Trolltech", "tst_qsettings");
QSettings settings("QtProject", "tst_qsettings");
QCOMPARE(settings.value("nullString").toString(), nullString);
QCOMPARE(settings.value("emptyString").toString(), emptyString);
QCOMPARE(settings.value("emptyList").toStringList(), emptyList);

2
tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
View File

@ -121,7 +121,7 @@ public:
tst_QAbstractNetworkCache::tst_QAbstractNetworkCache()
{
QCoreApplication::setOrganizationName(QLatin1String("Trolltech"));
QCoreApplication::setOrganizationName(QLatin1String("QtProject"));
QCoreApplication::setApplicationName(QLatin1String("autotest_qabstractnetworkcache"));
QCoreApplication::setApplicationVersion(QLatin1String("1.0"));
}

4
tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
View File

@ -166,7 +166,7 @@ tst_QFiledialog::~tst_QFiledialog()
void tst_QFiledialog::init()
{
// Save the developers settings so they don't get mad when their sidebar folders are gone.
QSettings settings(QSettings::UserScope, QLatin1String("Trolltech"));
QSettings settings(QSettings::UserScope, QLatin1String("QtProject"));
settings.beginGroup(QLatin1String("Qt"));
userSettings = settings.value(QLatin1String("filedialog")).toByteArray();
settings.remove(QLatin1String("filedialog"));
@ -180,7 +180,7 @@ void tst_QFiledialog::init()
void tst_QFiledialog::cleanup()
{
QSettings settings(QSettings::UserScope, QLatin1String("Trolltech"));
QSettings settings(QSettings::UserScope, QLatin1String("QtProject"));
settings.beginGroup(QLatin1String("Qt"));
settings.setValue(QLatin1String("filedialog"), userSettings);
}

4
tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp
View File

@ -165,7 +165,7 @@ void tst_QFileDialog2::init()
QVERIFY(tempDir.isValid());
// Save the developers settings so they don't get mad when their sidebar folders are gone.
QSettings settings(QSettings::UserScope, QLatin1String("Trolltech"));
QSettings settings(QSettings::UserScope, QLatin1String("QtProject"));
settings.beginGroup(QLatin1String("Qt"));
userSettings = settings.value(QLatin1String("filedialog")).toByteArray();
settings.remove(QLatin1String("filedialog"));
@ -179,7 +179,7 @@ void tst_QFileDialog2::init()
void tst_QFileDialog2::cleanup()
{
QSettings settings(QSettings::UserScope, QLatin1String("Trolltech"));
QSettings settings(QSettings::UserScope, QLatin1String("QtProject"));
settings.beginGroup(QLatin1String("Qt"));
settings.setValue(QLatin1String("filedialog"), userSettings);
}

10
tests/benchmarks/corelib/tools/qstring/fromlatin1.cpp
View File

@ -629,7 +629,7 @@ static const char charData[] __attribute__((aligned(64))) = {
// #126
"\377\376"
"Trolltech"
"QtProject"
"\377\376\375\374\373" // 3328
// #127
@ -827,7 +827,7 @@ static const char charData[] __attribute__((aligned(64))) = {
"\377\376\375\374\373\372\371\370\367\366\365\364\363\362\361\360" // 4544
// #166
"Trolltech"
"QtProject"
"\377\376\375\374\373\372\371" // 4560
// #167
@ -980,7 +980,7 @@ static const char charData[] __attribute__((aligned(64))) = {
"\377\376\375\374\373" // 5488
// #197
"Trolltech"
"QtProject"
"\377\376\375\374\373\372\371" // 5504
// #198
@ -6955,7 +6955,7 @@ static const char charData[] __attribute__((aligned(64))) = {
"\377\376\375" // 58688
// #1425
"Trolltech"
"QtProject"
"\377\376\375\374\373\372\371" // 58704
// #1426
@ -28453,7 +28453,7 @@ static const char charData[] __attribute__((aligned(64))) = {
"\377\376" // 268688
// #5853
"Trolltech"
"QtProject"
"\377\376\375\374\373\372\371" // 268704
// #5854

4
tests/manual/lance/widgets.h
View File

@ -99,7 +99,7 @@ public:
m_filename(file),
m_view_mode(RenderView)
{
QSettings settings("Trolltech", "lance");
QSettings settings("QtProject", "lance");
for (int i=0; i<10; ++i) {
QPointF suggestion(100 + i * 40, 100 + 100 * qSin(i * 3.1415 / 10.0));
m_controlPoints << settings.value("cp" + QString::number(i), suggestion).toPointF();
@ -154,7 +154,7 @@ public:
~OnScreenWidget()
{
QSettings settings("Trolltech", "lance");
QSettings settings("QtProject", "lance");
for (int i=0; i<10; ++i) {
settings.setValue("cp" + QString::number(i), m_controlPoints.at(i));
}