summaryrefslogtreecommitdiffstats
path: root/rbutil/rbutilqt/base
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2020-11-28 20:28:51 +0100
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2020-12-03 22:25:12 +0100
commit78a01db47cac5fa67aeee6f1c5134f89c3e4944a (patch)
tree4e1ffe91ff017c42cba9a580521c7ad98628eaaa /rbutil/rbutilqt/base
parent10f05b3b27890a73d01ee6d0309876f2c2ef9b33 (diff)
downloadrockbox-78a01db47cac5fa67aeee6f1c5134f89c3e4944a.tar.gz
rockbox-78a01db47cac5fa67aeee6f1c5134f89c3e4944a.zip
rbutil: Get rid of configure_modelname in rbutil.ini.
The target selection string used for configure is the same as the internally used player string, minus the (optional) variant suffix. Don't duplicate things, simply strip the suffix. Change-Id: Ic34bd5f933fab0d837adce0d0ae9c403868d720d
Diffstat (limited to 'rbutil/rbutilqt/base')
-rw-r--r--rbutil/rbutilqt/base/systeminfo.cpp1
-rw-r--r--rbutil/rbutilqt/base/systeminfo.h1
-rw-r--r--rbutil/rbutilqt/base/utils.cpp2
3 files changed, 1 insertions, 3 deletions
diff --git a/rbutil/rbutilqt/base/systeminfo.cpp b/rbutil/rbutilqt/base/systeminfo.cpp
index 959a073757..8868ba937b 100644
--- a/rbutil/rbutilqt/base/systeminfo.cpp
+++ b/rbutil/rbutilqt/base/systeminfo.cpp
@@ -59,7 +59,6 @@ const static struct {
{ SystemInfo::Encoder, ":platform:/encoder", "" },
{ SystemInfo::Brand, ":platform:/brand", "" },
{ SystemInfo::Name, ":platform:/name", "" },
- { SystemInfo::ConfigureModel, ":platform:/configure_modelname", "" },
{ SystemInfo::PlayerPicture, ":platform:/playerpic", "" },
};
diff --git a/rbutil/rbutilqt/base/systeminfo.h b/rbutil/rbutilqt/base/systeminfo.h
index 23288a1999..67863c2268 100644
--- a/rbutil/rbutilqt/base/systeminfo.h
+++ b/rbutil/rbutilqt/base/systeminfo.h
@@ -72,7 +72,6 @@ class SystemInfo : public QObject
Encoder,
Brand,
Name,
- ConfigureModel,
PlayerPicture,
};
diff --git a/rbutil/rbutilqt/base/utils.cpp b/rbutil/rbutilqt/base/utils.cpp
index 83c189b8a2..2f01f42e2c 100644
--- a/rbutil/rbutilqt/base/utils.cpp
+++ b/rbutil/rbutilqt/base/utils.cpp
@@ -381,7 +381,7 @@ QString Utils::checkEnvironment(bool permission)
RockboxInfo rbinfo(RbSettings::value(RbSettings::Mountpoint).toString());
QString installed = rbinfo.target();
if(!installed.isEmpty() && installed !=
- SystemInfo::platformValue(SystemInfo::ConfigureModel).toString())
+ RbSettings::value(RbSettings::CurrentPlatform).toString().split(".").at(0))
{
text += tr("<li>Target mismatch detected.<br/>"
"Installed target: %1<br/>Selected target: %2.</li>")