From 9a415bf40a5e5ff231cd785b9898f15ad205eea9 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Tue, 5 Apr 2016 10:18:49 +0200 Subject: [PATCH] Enable updates check only on Windows --- BUILDING | 6 ------ src/lib/app/mainapplication.cpp | 4 ++-- src/lib/app/qzcommon.h | 6 +++--- src/lib/preferences/preferences.cpp | 2 +- 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/BUILDING b/BUILDING index ee9e40f63..5c5a813b6 100644 --- a/BUILDING +++ b/BUILDING @@ -99,12 +99,6 @@ Available Defines example: $ export NONBLOCK_JS_DIALOGS="true" - DISABLE_UPDATES_CHECK Disables option to check for updates at startup. - (disabled by default) - - example: - $ export DISABLE_UPDATES_CHECK="true" - Windows specific defines: diff --git a/src/lib/app/mainapplication.cpp b/src/lib/app/mainapplication.cpp index ebbce1d7c..dc2e5f841 100644 --- a/src/lib/app/mainapplication.cpp +++ b/src/lib/app/mainapplication.cpp @@ -288,8 +288,8 @@ MainApplication::MainApplication(int &argc, char** argv) m_isStartingAfterCrash = settings.value("SessionRestore/isRunning", false).toBool(); settings.setValue("SessionRestore/isRunning", true); -#ifndef DISABLE_UPDATES_CHECK - bool checkUpdates = settings.value("Web-Browser-Settings/CheckUpdates", DEFAULT_CHECK_UPDATES).toBool(); +#ifndef DISABLE_CHECK_UPDATES + bool checkUpdates = settings.value("Web-Browser-Settings/CheckUpdates", true).toBool(); if (checkUpdates) { new Updater(window); diff --git a/src/lib/app/qzcommon.h b/src/lib/app/qzcommon.h index 64876e9cd..6f48456d2 100644 --- a/src/lib/app/qzcommon.h +++ b/src/lib/app/qzcommon.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2014 David Rosca +* Copyright (C) 2010-2016 David Rosca * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -127,9 +127,9 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(Qz::NewTabPositionFlags) #endif #ifdef Q_OS_WIN -#define DEFAULT_CHECK_UPDATES true +#define DISABLE_CHECK_UPDATES false #else -#define DEFAULT_CHECK_UPDATES false +#define DISABLE_CHECK_UPDATES true #endif #define DEFAULT_CHECK_DEFAULTBROWSER false diff --git a/src/lib/preferences/preferences.cpp b/src/lib/preferences/preferences.cpp index 2ee450f8a..a5097ed68 100644 --- a/src/lib/preferences/preferences.cpp +++ b/src/lib/preferences/preferences.cpp @@ -146,7 +146,7 @@ Preferences::Preferences(BrowserWindow* window) ui->newTabUrl->setText(m_newTabUrl.toEncoded()); settings.endGroup(); ui->afterLaunch->setCurrentIndex(mApp->afterLaunch()); - ui->checkUpdates->setChecked(settings.value("Web-Browser-Settings/CheckUpdates", DEFAULT_CHECK_UPDATES).toBool()); + ui->checkUpdates->setChecked(settings.value("Web-Browser-Settings/CheckUpdates", true).toBool()); ui->dontLoadTabsUntilSelected->setChecked(settings.value("Web-Browser-Settings/LoadTabsOnActivation", true).toBool()); #if defined(Q_OS_WIN) && !defined(Q_OS_OS2)