diff options
Diffstat (limited to 'rbutil/rbutilqt/base')
-rw-r--r-- | rbutil/rbutilqt/base/systeminfo.cpp | 1 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/systeminfo.h | 1 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/utils.cpp | 2 |
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 { | |||
59 | { SystemInfo::Encoder, ":platform:/encoder", "" }, | 59 | { SystemInfo::Encoder, ":platform:/encoder", "" }, |
60 | { SystemInfo::Brand, ":platform:/brand", "" }, | 60 | { SystemInfo::Brand, ":platform:/brand", "" }, |
61 | { SystemInfo::Name, ":platform:/name", "" }, | 61 | { SystemInfo::Name, ":platform:/name", "" }, |
62 | { SystemInfo::ConfigureModel, ":platform:/configure_modelname", "" }, | ||
63 | { SystemInfo::PlayerPicture, ":platform:/playerpic", "" }, | 62 | { SystemInfo::PlayerPicture, ":platform:/playerpic", "" }, |
64 | }; | 63 | }; |
65 | 64 | ||
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 | |||
72 | Encoder, | 72 | Encoder, |
73 | Brand, | 73 | Brand, |
74 | Name, | 74 | Name, |
75 | ConfigureModel, | ||
76 | PlayerPicture, | 75 | PlayerPicture, |
77 | }; | 76 | }; |
78 | 77 | ||
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) | |||
381 | RockboxInfo rbinfo(RbSettings::value(RbSettings::Mountpoint).toString()); | 381 | RockboxInfo rbinfo(RbSettings::value(RbSettings::Mountpoint).toString()); |
382 | QString installed = rbinfo.target(); | 382 | QString installed = rbinfo.target(); |
383 | if(!installed.isEmpty() && installed != | 383 | if(!installed.isEmpty() && installed != |
384 | SystemInfo::platformValue(SystemInfo::ConfigureModel).toString()) | 384 | RbSettings::value(RbSettings::CurrentPlatform).toString().split(".").at(0)) |
385 | { | 385 | { |
386 | text += tr("<li>Target mismatch detected.<br/>" | 386 | text += tr("<li>Target mismatch detected.<br/>" |
387 | "Installed target: %1<br/>Selected target: %2.</li>") | 387 | "Installed target: %1<br/>Selected target: %2.</li>") |