History

PR Fixes

Leonardo Murillo committed 12 years ago

Commit b972d421 parent a9c29403 files · +14 −21Browse files

Showing the changes to interface/src/Application.cpp (1 of 3 files). Show all

Unified · Split

interface/src/Application.cpp+4−3
@@ -203,7 +203,7 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : · 202 unmodified lines
203 setOrganizationName(applicationInfo.value("organizationName").toString());203 setOrganizationName(applicationInfo.value("organizationName").toString());
204 setOrganizationDomain(applicationInfo.value("organizationDomain").toString());204 setOrganizationDomain(applicationInfo.value("organizationDomain").toString());
205 205
206 qDebug("[VERSION] Build sequence: %s\n", applicationVersion().toStdString().c_str());206 qDebug() << "[VERSION] Build sequence: " << qPrintable(applicationVersion());
207 207
208 _settings = new QSettings(this);208 _settings = new QSettings(this);
209 209
@@ -4426,6 +4426,7 @@ void Application::parseVersionXml() { · 4216 unmodified lines
4426 QString releaseDate;4426 QString releaseDate;
4427 QString releaseNotes;4427 QString releaseNotes;
4428 QString latestVersion;4428 QString latestVersion;
4429 QUrl downloadUrl;
4429 4430
4430 QXmlStreamReader xml(_latestVersionReply);4431 QXmlStreamReader xml(_latestVersionReply);
4431 while (!xml.atEnd() && !xml.hasError()) {4432 while (!xml.atEnd() && !xml.hasError()) {
@@ -4446,13 +4447,13 @@ void Application::parseVersionXml() { · 14 unmodified lines
4446 }4447 }
4447 if (xml.name() == operatingSystem) {4448 if (xml.name() == operatingSystem) {
4448 xml.readNext();4449 xml.readNext();
4449 _downloadUrl = QUrl(xml.text().toString());4450 downloadUrl = QUrl(xml.text().toString());
4450 }4451 }
4451 }4452 }
4452 }4453 }
4453 4454
4454 if (!shouldSkipVersion(latestVersion) && applicationVersion() != latestVersion) {4455 if (!shouldSkipVersion(latestVersion) && applicationVersion() != latestVersion) {
4455 new UpdateDialog(_glWidget, releaseNotes, latestVersion, _downloadUrl);4456 new UpdateDialog(_glWidget, releaseNotes, latestVersion, downloadUrl);
4456 }4457 }
4457 4458
4458 delete _latestVersionReply;4459 delete _latestVersionReply;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t