aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2022-06-09 13:56:25 -0500
committerluigi1111 <luigi1111w@gmail.com>2022-06-09 13:56:25 -0500
commit17dfd2e9ed292f316ce5383046fadfeba4f12ec0 (patch)
treed4985865acd549d6effba38f8e3f9ea658586b98
parent49d8a6b91d6ba89ec99893cb6cc25efa6eeb5c1c (diff)
parent9b7bca611601a3b8a27a1e3aad636f74df47a162 (diff)
downloadmonzero-gui-17dfd2e9ed292f316ce5383046fadfeba4f12ec0.tar.gz
monzero-gui-17dfd2e9ed292f316ce5383046fadfeba4f12ec0.tar.xz
monzero-gui-17dfd2e9ed292f316ce5383046fadfeba4f12ec0.zip
Merge pull request #3906
9b7bca6 main: add compile time option to disable updates (selsta)
-rw-r--r--CMakeLists.txt5
-rw-r--r--src/main/main.cpp4
2 files changed, 9 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2d23d940..bc2f5f3d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,6 +13,7 @@ option(STATIC "Link libraries statically, requires static Qt")
option(USE_DEVICE_TREZOR "Trezor support compilation" ON)
option(WITH_SCANNER "Enable webcam QR scanner" OFF)
option(WITH_DESKTOP_ENTRY "Ask to install desktop entry on first startup" ON)
+option(WITH_UPDATER "Regularly check for new updates" ON)
option(DEV_MODE "Checkout latest monero master on build" OFF)
list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_SOURCE_DIR}/cmake")
@@ -87,6 +88,10 @@ if(WITH_DESKTOP_ENTRY)
add_definitions(-DWITH_DESKTOP_ENTRY)
endif()
+if(WITH_UPDATER)
+ add_definitions(-DWITH_UPDATER)
+endif()
+
# Sodium
find_library(SODIUM_LIBRARY sodium)
message(STATUS "libsodium: libraries at ${SODIUM_LIBRARY}")
diff --git a/src/main/main.cpp b/src/main/main.cpp
index db339d71..e6a1cda1 100644
--- a/src/main/main.cpp
+++ b/src/main/main.cpp
@@ -498,7 +498,11 @@ Verify update binary using 'shasum'-compatible (SHA256 algo) output signed by tw
engine.rootContext()->setContextProperty("homePath", QDir::homePath());
engine.rootContext()->setContextProperty("applicationDirectory", QApplication::applicationDirPath());
engine.rootContext()->setContextProperty("idealThreadCount", QThread::idealThreadCount());
+#ifdef WITH_UPDATER
engine.rootContext()->setContextProperty("disableCheckUpdatesFlag", parser.isSet(disableCheckUpdatesOption));
+#else
+ engine.rootContext()->setContextProperty("disableCheckUpdatesFlag", true);
+#endif
engine.rootContext()->setContextProperty("socksProxyFlag", parser.value(socksProxyOption));
engine.rootContext()->setContextProperty("socksProxyFlagSet", parser.isSet(socksProxyOption));