1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove versioned config backwards compatibility hack

Browse Source 
the vendor string was changed, so compat is broken anyway.

Change-Id: I07241843237ce28bd7a869bb4170c7e4c8d084df
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Oswald Buddenhagen 2013-01-30 18:43:13 +01:00 committed by The Qt Project
parent 06a6d1da58
commit feb33916fd
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
qmake/property.cpp
View File

@ -118,10 +118,7 @@ QMakeProperty::value(const ProKey &vk)
return val; return val;
initSettings(); initSettings();
QString v = vk.toQString(); return settings->value(vk.toQString()).toString();
if (!settings->contains(v))
return settings->value("2.01a/" + v).toString(); // Backwards compat
return settings->value(v).toString();
} }
bool bool
@ -135,7 +132,6 @@ QMakeProperty::setValue(QString var, const QString &val)
{ {
initSettings(); initSettings();
settings->setValue(var, val); settings->setValue(var, val);
settings->remove("2.01a/" + var); // Backwards compat
} }
void void
@ -143,7 +139,6 @@ QMakeProperty::remove(const QString &var)
{ {
initSettings(); initSettings();
settings->remove(var); settings->remove(var);
settings->remove("2.01a/" + var); // Backwards compat
} }
bool bool
@ -153,13 +148,8 @@ QMakeProperty::exec()
if(Option::qmake_mode == Option::QMAKE_QUERY_PROPERTY) { if(Option::qmake_mode == Option::QMAKE_QUERY_PROPERTY) {
if(Option::prop::properties.isEmpty()) { if(Option::prop::properties.isEmpty()) {
initSettings(); initSettings();
QStringList keys = settings->childKeys(); foreach (const QString &key, settings->childKeys()) {
settings->beginGroup("2.01a"); QString val = settings->value(key).toString();
keys += settings->childKeys();
settings->endGroup();
keys.removeDuplicates();
foreach (const QString &key, keys) {
QString val = settings->value(settings->contains(key) ? key : "2.01a/" + key).toString();
fprintf(stdout, "%s:%s\n", qPrintable(key), qPrintable(val)); fprintf(stdout, "%s:%s\n", qPrintable(key), qPrintable(val));
} }
QStringList specialProps; QStringList specialProps;