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

Signed-off-by: alex-z <blackslayer4@gmail.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 502458147dfc9a498b89530550fdec12d6c2a580..9c6d07f24441409bcdce38322d9b3f40adfb1fbc 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -123,11 +123,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 70725bd337525254ce9aa213affd7ec8989ae5af..69464cfcc90edc374286ad5efbaf8ad5eeaa8155 100644 (file)
--- 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 1e8cb6e65fbd1423a57ec8348859ed9eed20c9f4..c62386cc6b6a4950cbf63993f1625e50299055e2 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -42,4 +42,6 @@
 
 #cmakedefine01 GUI_TESTING
 
+#cmakedefine BUILD_UPDATER "@BUILD_UPDATER@"
+
 #endif

diff --git a/src/gui/generalsettings.cpp b/src/gui/generalsettings.cpp
index 058bdf1d66998913832461c581da81cb2d6a9839..589ab7afed90a357042333cf28114b98fac2f136 100644 (file)
--- 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 06675c8cce49f3ae6809f409894d8a90331adf82..8243fb241a00470bddf31cf8d2460c7816585543 100644 (file)
--- 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>