Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +01:00
Code Releases Activity

Enable updates check only on Windows

Browse Source
This commit is contained in:
David Rosca 2016-04-05 10:18:49 +02:00
parent 49315fa84e
commit 9a415bf40a
4 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BUILDING
View File

@ -99,12 +99,6 @@ Available Defines
example: example:
$ export NONBLOCK_JS_DIALOGS="true" $ 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: Windows specific defines:

4
src/lib/app/mainapplication.cpp
View File

@ -288,8 +288,8 @@ MainApplication::MainApplication(int &argc, char** argv)
m_isStartingAfterCrash = settings.value("SessionRestore/isRunning", false).toBool(); m_isStartingAfterCrash = settings.value("SessionRestore/isRunning", false).toBool();
settings.setValue("SessionRestore/isRunning", true); settings.setValue("SessionRestore/isRunning", true);
#ifndef DISABLE_UPDATES_CHECK #ifndef DISABLE_CHECK_UPDATES
bool checkUpdates = settings.value("Web-Browser-Settings/CheckUpdates", DEFAULT_CHECK_UPDATES).toBool(); bool checkUpdates = settings.value("Web-Browser-Settings/CheckUpdates", true).toBool();
if (checkUpdates) { if (checkUpdates) {
new Updater(window); new Updater(window);

6
src/lib/app/qzcommon.h
View File

@ -1,6 +1,6 @@
/* ============================================================ /* ============================================================
* QupZilla - WebKit based browser * QupZilla - WebKit based browser
* Copyright (C) 2010-2014 David Rosca <nowrep@gmail.com> * Copyright (C) 2010-2016 David Rosca <nowrep@gmail.com>
* *
* This program is free software: you can redistribute it and/or modify * 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 * 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 #endif
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
#define DEFAULT_CHECK_UPDATES true #define DISABLE_CHECK_UPDATES false
#else #else
#define DEFAULT_CHECK_UPDATES false #define DISABLE_CHECK_UPDATES true
#endif #endif
#define DEFAULT_CHECK_DEFAULTBROWSER false #define DEFAULT_CHECK_DEFAULTBROWSER false

2
src/lib/preferences/preferences.cpp
View File

@ -146,7 +146,7 @@ Preferences::Preferences(BrowserWindow* window)
ui->newTabUrl->setText(m_newTabUrl.toEncoded()); ui->newTabUrl->setText(m_newTabUrl.toEncoded());
settings.endGroup(); settings.endGroup();
ui->afterLaunch->setCurrentIndex(mApp->afterLaunch()); 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()); ui->dontLoadTabsUntilSelected->setChecked(settings.value("Web-Browser-Settings/LoadTabsOnActivation", true).toBool());
#if defined(Q_OS_WIN) && !defined(Q_OS_OS2) #if defined(Q_OS_WIN) && !defined(Q_OS_OS2)