Always build with updater. Use 'beta/stable' channel seletor in 'General Settins' dialog with default 'stable'.

Signed-off-by: alex-z <blackslayer4@gmail.com>
This commit is contained in:
alex-z 2022-01-28 15:37:51 +02:00 committed by Matthieu Gallien (Rebase PR Action)
parent 375c7b585c
commit 0776df65c3
5 changed files with 5 additions and 6 deletions

View file

@ -123,11 +123,8 @@ if(NO_MSG_HANDLER)
add_definitions(-DNO_MSG_HANDLER=1) add_definitions(-DNO_MSG_HANDLER=1)
endif() endif()
# this option builds the updater
option(BUILD_UPDATER "BUILD_UPDATER" OFF)
if(BUILD_UPDATER) if(BUILD_UPDATER)
message("Compiling with updater") message("Compiling with updater")
add_definitions(-DBUILD_UPDATER=1)
else() else()
message("Compiling without updater") message("Compiling without updater")
endif() endif()

View file

@ -30,7 +30,7 @@ option( WITH_CRASHREPORTER "Build crashreporter" OFF )
#set( CRASHREPORTER_ICON ":/owncloud-icon.png" ) #set( CRASHREPORTER_ICON ":/owncloud-icon.png" )
## Updater options ## Updater options
option( BUILD_UPDATER "Build updater" OFF ) option( BUILD_UPDATER "Build updater" ON )
option( WITH_PROVIDERS "Build with providers list" ON ) option( WITH_PROVIDERS "Build with providers list" ON )

View file

@ -42,4 +42,6 @@
#cmakedefine01 GUI_TESTING #cmakedefine01 GUI_TESTING
#cmakedefine BUILD_UPDATER "@BUILD_UPDATER@"
#endif #endif

View file

@ -36,8 +36,6 @@
#include "common/utility.h" #include "common/utility.h"
#include "logger.h" #include "logger.h"
#include "config.h"
#include "legalnotice.h" #include "legalnotice.h"
#include <QFileDialog> #include <QFileDialog>

View file

@ -15,6 +15,8 @@
#ifndef MIRALL_GENERALSETTINGS_H #ifndef MIRALL_GENERALSETTINGS_H
#define MIRALL_GENERALSETTINGS_H #define MIRALL_GENERALSETTINGS_H
#include "config.h"
#include <QWidget> #include <QWidget>
#include <QPointer> #include <QPointer>