summaryrefslogtreecommitdiff
path: root/rbutil/rbutilqt/themesinstallwindow.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'rbutil/rbutilqt/themesinstallwindow.cpp')
-rw-r--r--rbutil/rbutilqt/themesinstallwindow.cpp14
1 files changed, 2 insertions, 12 deletions
diff --git a/rbutil/rbutilqt/themesinstallwindow.cpp b/rbutil/rbutilqt/themesinstallwindow.cpp
index 935c703193..cb06b47b1f 100644
--- a/rbutil/rbutilqt/themesinstallwindow.cpp
+++ b/rbutil/rbutilqt/themesinstallwindow.cpp
@@ -62,16 +62,6 @@ void ThemesInstallWindow::downloadInfo()
62 getter = new HttpGet(this); 62 getter = new HttpGet(this);
63 RockboxInfo installInfo 63 RockboxInfo installInfo
64 = RockboxInfo(RbSettings::value(RbSettings::Mountpoint).toString()); 64 = RockboxInfo(RbSettings::value(RbSettings::Mountpoint).toString());
65 QString revision;
66 QString release;
67 // installInfo.version() holds either the revision (as r<revision>-<date>)
68 // or the release version number.
69 if(installInfo.version().startsWith("r")) {
70 revision = installInfo.version().remove("r").replace(QRegExp("-.+$"), "");
71 }
72 else {
73 release = installInfo.version();
74 }
75 65
76 themesInfo.open(); 66 themesInfo.open();
77 qDebug() << "[Themes] downloading info to" << themesInfo.fileName(); 67 qDebug() << "[Themes] downloading info to" << themesInfo.fileName();
@@ -80,8 +70,8 @@ void ThemesInstallWindow::downloadInfo()
80 QString infoUrl = SystemInfo::value(SystemInfo::ThemesInfoUrl).toString(); 70 QString infoUrl = SystemInfo::value(SystemInfo::ThemesInfoUrl).toString();
81 infoUrl.replace("%TARGET%", 71 infoUrl.replace("%TARGET%",
82 SystemInfo::value(SystemInfo::CurConfigureModel).toString()); 72 SystemInfo::value(SystemInfo::CurConfigureModel).toString());
83 infoUrl.replace("%REVISION%", revision); 73 infoUrl.replace("%REVISION%", installInfo.revision());
84 infoUrl.replace("%RELEASE%", release); 74 infoUrl.replace("%RELEASE%", installInfo.release());
85 infoUrl.replace("%RBUTILVER%", VERSION); 75 infoUrl.replace("%RBUTILVER%", VERSION);
86 QUrl url = QUrl(infoUrl); 76 QUrl url = QUrl(infoUrl);
87 qDebug() << "[Themes] Info URL:" << url << "Query:" << url.queryItems(); 77 qDebug() << "[Themes] Info URL:" << url << "Query:" << url.queryItems();