summaryrefslogtreecommitdiffstats
path: root/rbutil/rbutilqt/base/serverinfo.cpp
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2010-02-12 20:38:17 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2010-02-12 20:38:17 +0000
commit4c9fc9cb7ed9cb9c0163f81acce5b71ae2dcb29d (patch)
tree72aadddd80a8e689072be8075cf74d8360353632 /rbutil/rbutilqt/base/serverinfo.cpp
parent9a256c96f7fcb60d94bb0c58f499e2f43ce9957a (diff)
downloadrockbox-4c9fc9cb7ed9cb9c0163f81acce5b71ae2dcb29d.tar.gz
rockbox-4c9fc9cb7ed9cb9c0163f81acce5b71ae2dcb29d.tar.bz2
rockbox-4c9fc9cb7ed9cb9c0163f81acce5b71ae2dcb29d.zip
Fix problems with platform retrieval.
- handle disabled platforms also for for variant and base groups. - make variant detection more strict to prevent variants that are a substring of other variants to match. Happened e.g. for iriverh10 and iriverh100. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24625 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil/rbutilqt/base/serverinfo.cpp')
-rw-r--r--rbutil/rbutilqt/base/serverinfo.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/rbutil/rbutilqt/base/serverinfo.cpp b/rbutil/rbutilqt/base/serverinfo.cpp
index e581e952ac..0151273338 100644
--- a/rbutil/rbutilqt/base/serverinfo.cpp
+++ b/rbutil/rbutilqt/base/serverinfo.cpp
@@ -54,13 +54,13 @@ void ServerInfo::readBuildInfo(QString file)
info.endGroup();
// get base platforms, handle variants with platforms in the loop
- QStringList platforms = SystemInfo::platforms(SystemInfo::PlatformBase);
+ QStringList platforms = SystemInfo::platforms(SystemInfo::PlatformBaseDisabled);
for(int i = 0; i < platforms.size(); i++)
{
// check if there are rbutil-variants of the current platform and handle
// them the same time.
QStringList variants;
- variants = SystemInfo::platforms(SystemInfo::PlatformVariant, platforms.at(i));
+ variants = SystemInfo::platforms(SystemInfo::PlatformVariantDisabled, platforms.at(i));
QVariant release;
info.beginGroup("release");
if(keys.contains(platforms.at(i))) {