diff options
| author | alex-z <blackslayer4@gmail.com> | 2022-01-28 16:37:51 +0300 |
|---|---|---|
| committer | backportbot[bot] <backportbot[bot]@users.noreply.github.com> | 2022-02-03 15:27:23 +0300 |
| commit | 2765c1c2f06d5fc786b5f916d13f6d360f0280c3 (patch) | |
| tree | 243e6d6a4c03b61c1244457ac9d41e98526a7378 | |
| parent | 65c1f5eb88b79f9c836fa4870370f042a132c825 (diff) | |
Always build with updater. Use 'beta/stable' channel seletor in 'General Settins' dialog with default 'stable'.backport/4217/stable-3.4
Signed-off-by: alex-z <blackslayer4@gmail.com>
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | NEXTCLOUD.cmake | 2 | ||||
| -rw-r--r-- | config.h.in | 2 | ||||
| -rw-r--r-- | src/gui/generalsettings.cpp | 2 | ||||
| -rw-r--r-- | src/gui/generalsettings.h | 2 |
5 files changed, 5 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 930e5a9e7..c517bbdd5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -119,11 +119,8 @@ if(NO_MSG_HANDLER) add_definitions(-DNO_MSG_HANDLER=1) endif() -# this option builds the updater -option(BUILD_UPDATER "BUILD_UPDATER" OFF) if(BUILD_UPDATER) message("Compiling with updater") - add_definitions(-DBUILD_UPDATER=1) else() message("Compiling without updater") endif() diff --git a/NEXTCLOUD.cmake b/NEXTCLOUD.cmake index d34e682af..be7cb32c9 100644 --- a/NEXTCLOUD.cmake +++ b/NEXTCLOUD.cmake @@ -30,7 +30,7 @@ option( WITH_CRASHREPORTER "Build crashreporter" OFF ) #set( CRASHREPORTER_ICON ":/owncloud-icon.png" ) ## Updater options -option( BUILD_UPDATER "Build updater" OFF ) +option( BUILD_UPDATER "Build updater" ON ) option( WITH_PROVIDERS "Build with providers list" ON ) diff --git a/config.h.in b/config.h.in index e9eff6c92..18a12f61b 100644 --- a/config.h.in +++ b/config.h.in @@ -41,4 +41,6 @@ #cmakedefine01 GUI_TESTING +#cmakedefine BUILD_UPDATER "@BUILD_UPDATER@" + #endif diff --git a/src/gui/generalsettings.cpp b/src/gui/generalsettings.cpp index 058bdf1d6..589ab7afe 100644 --- a/src/gui/generalsettings.cpp +++ b/src/gui/generalsettings.cpp @@ -36,8 +36,6 @@ #include "common/utility.h" #include "logger.h" -#include "config.h" - #include "legalnotice.h" #include <QFileDialog> diff --git a/src/gui/generalsettings.h b/src/gui/generalsettings.h index 06675c8cc..8243fb241 100644 --- a/src/gui/generalsettings.h +++ b/src/gui/generalsettings.h @@ -15,6 +15,8 @@ #ifndef MIRALL_GENERALSETTINGS_H #define MIRALL_GENERALSETTINGS_H +#include "config.h" + #include <QWidget> #include <QPointer> |