summaryrefslogtreecommitdiff
path: root/rbutil/rbutilqt
diff options
context:
space:
mode:
Diffstat (limited to 'rbutil/rbutilqt')
-rw-r--r--rbutil/rbutilqt/base/systeminfo.cpp1
-rw-r--r--rbutil/rbutilqt/base/systeminfo.h1
-rw-r--r--rbutil/rbutilqt/base/utils.cpp4
-rw-r--r--rbutil/rbutilqt/configure.cpp2
-rw-r--r--rbutil/rbutilqt/gui/selectiveinstallwidget.cpp2
5 files changed, 4 insertions, 6 deletions
diff --git a/rbutil/rbutilqt/base/systeminfo.cpp b/rbutil/rbutilqt/base/systeminfo.cpp
index b0837438cb..b9a7602a5b 100644
--- a/rbutil/rbutilqt/base/systeminfo.cpp
+++ b/rbutil/rbutilqt/base/systeminfo.cpp
@@ -51,7 +51,6 @@ const static struct {
51 const char* name; 51 const char* name;
52 const char* def; 52 const char* def;
53} PlatformInfosList[] = { 53} PlatformInfosList[] = {
54 { SystemInfo::PlatformName, ":platform:/name", "" },
55 { SystemInfo::Manual, ":platform:/manualname", ":platform:" }, 54 { SystemInfo::Manual, ":platform:/manualname", ":platform:" },
56 { SystemInfo::BootloaderMethod, ":platform:/bootloadermethod", "none" }, 55 { SystemInfo::BootloaderMethod, ":platform:/bootloadermethod", "none" },
57 { SystemInfo::BootloaderName, ":platform:/bootloadername", "" }, 56 { SystemInfo::BootloaderName, ":platform:/bootloadername", "" },
diff --git a/rbutil/rbutilqt/base/systeminfo.h b/rbutil/rbutilqt/base/systeminfo.h
index 9bcfe6d253..1aef791975 100644
--- a/rbutil/rbutilqt/base/systeminfo.h
+++ b/rbutil/rbutilqt/base/systeminfo.h
@@ -64,7 +64,6 @@ class SystemInfo : public QObject
64 }; 64 };
65 65
66 enum PlatformInfo { 66 enum PlatformInfo {
67 PlatformName,
68 Manual, 67 Manual,
69 BootloaderMethod, 68 BootloaderMethod,
70 BootloaderName, 69 BootloaderName,
diff --git a/rbutil/rbutilqt/base/utils.cpp b/rbutil/rbutilqt/base/utils.cpp
index 60b55068e1..83c189b8a2 100644
--- a/rbutil/rbutilqt/base/utils.cpp
+++ b/rbutil/rbutilqt/base/utils.cpp
@@ -385,8 +385,8 @@ QString Utils::checkEnvironment(bool permission)
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>")
388 .arg(SystemInfo::platformValue(SystemInfo::PlatformName, installed).toString(), 388 .arg(SystemInfo::platformValue(SystemInfo::Name, installed).toString(),
389 SystemInfo::platformValue(SystemInfo::PlatformName).toString()); 389 SystemInfo::platformValue(SystemInfo::Name).toString());
390 } 390 }
391 391
392 if(!text.isEmpty()) 392 if(!text.isEmpty())
diff --git a/rbutil/rbutilqt/configure.cpp b/rbutil/rbutilqt/configure.cpp
index 8115a86abc..b34379641e 100644
--- a/rbutil/rbutilqt/configure.cpp
+++ b/rbutil/rbutilqt/configure.cpp
@@ -742,7 +742,7 @@ void Config::autodetect()
742 } 742 }
743 msg += QString("<li>%1</li>").arg(tr("%1 at %2").arg( 743 msg += QString("<li>%1</li>").arg(tr("%1 at %2").arg(
744 SystemInfo::platformValue( 744 SystemInfo::platformValue(
745 SystemInfo::PlatformName, detected.at(i).device).toString(), 745 SystemInfo::Name, detected.at(i).device).toString(),
746 QDir::toNativeSeparators(mp))); 746 QDir::toNativeSeparators(mp)));
747 } 747 }
748 msg += "</ul>"; 748 msg += "</ul>";
diff --git a/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp b/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp
index 902f9861ed..3ac24666df 100644
--- a/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp
+++ b/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp
@@ -340,7 +340,7 @@ void SelectiveInstallWidget::installBootloader(void)
340 else if(bl->installed() == BootloaderInstallBase::BootloaderOther 340 else if(bl->installed() == BootloaderInstallBase::BootloaderOther
341 && bl->capabilities() & BootloaderInstallBase::Backup) 341 && bl->capabilities() & BootloaderInstallBase::Backup)
342 { 342 {
343 QString targetFolder = SystemInfo::platformValue(SystemInfo::PlatformName).toString() 343 QString targetFolder = SystemInfo::platformValue(SystemInfo::Name).toString()
344 + " Firmware Backup"; 344 + " Firmware Backup";
345 // remove invalid character(s) 345 // remove invalid character(s)
346 targetFolder.remove(QRegExp("[:/]")); 346 targetFolder.remove(QRegExp("[:/]"));