mirror of
https://github.com/overte-org/overte.git
synced 2025-08-06 09:57:13 +02:00
PR fixes
This commit is contained in:
parent
b972d4260c
commit
cc147bc8bf
1 changed files with 4 additions and 2 deletions
|
@ -4402,14 +4402,16 @@ void Application::updateLocalOctreeCache(bool firstTime) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void Application::checkVersion() {
|
void Application::checkVersion() {
|
||||||
|
qDebug() << "################### in check version";
|
||||||
QNetworkRequest latestVersionRequest((QUrl(CHECK_VERSION_URL)));
|
QNetworkRequest latestVersionRequest((QUrl(CHECK_VERSION_URL)));
|
||||||
latestVersionRequest.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache);
|
latestVersionRequest.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache);
|
||||||
_latestVersionReply = Application::getInstance()->getNetworkAccessManager()->get(latestVersionRequest);
|
_latestVersionReply = Application::getInstance()->getNetworkAccessManager()->get(latestVersionRequest);
|
||||||
|
|
||||||
connect(_latestVersionReply, SIGNAL(readyRead()), SLOT(parseVersionXml()));
|
connect(_latestVersionReply, SIGNAL(finished()), SLOT(parseVersionXml()));
|
||||||
}
|
}
|
||||||
|
|
||||||
void Application::parseVersionXml() {
|
void Application::parseVersionXml() {
|
||||||
|
qDebug() << "################### in parse version xml";
|
||||||
|
|
||||||
#ifdef Q_OS_WIN32
|
#ifdef Q_OS_WIN32
|
||||||
QString operatingSystem("win");
|
QString operatingSystem("win");
|
||||||
|
@ -4463,7 +4465,7 @@ bool Application::shouldSkipVersion(QString latestVersion) {
|
||||||
QFile skipFile(SKIP_FILENAME);
|
QFile skipFile(SKIP_FILENAME);
|
||||||
skipFile.open(QIODevice::ReadWrite);
|
skipFile.open(QIODevice::ReadWrite);
|
||||||
QString skipVersion(skipFile.readAll());
|
QString skipVersion(skipFile.readAll());
|
||||||
return (skipVersion == latestVersion || applicationVersion() == "dev");
|
return (skipVersion == latestVersion /*|| applicationVersion() == "dev"*/);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Application::skipVersion(QString latestVersion) {
|
void Application::skipVersion(QString latestVersion) {
|
||||||
|
|
Loading…
Reference in a new issue