From 887e3ad39406a1b017de1d17cf25ce70702b703e Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Wed, 27 Nov 2019 21:22:21 +0100
Subject: [PATCH] make sure rs_webui cannot be enabled without rs_jsonapi

---
 RetroShare.pro | 6 ++++++
 retroshare.pri | 8 ++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/RetroShare.pro b/RetroShare.pro
index e04442e4d..845cdd3a6 100644
--- a/RetroShare.pro
+++ b/RetroShare.pro
@@ -29,6 +29,12 @@ rs_jsonapi:isEmpty(JSONAPI_GENERATOR_EXE) {
     libretroshare.depends += jsonapi-generator
 }
 
+rs_webui {
+	!rs_jsonapi {
+		error("rs_webui requires rs_jsonapi")
+	}
+}
+
 SUBDIRS += libbitdht
 libbitdht.file = libbitdht/src/libbitdht.pro
 libretroshare.depends += openpgpsdk libbitdht
diff --git a/retroshare.pri b/retroshare.pri
index d140f9867..b6a786251 100644
--- a/retroshare.pri
+++ b/retroshare.pri
@@ -180,10 +180,10 @@ rs_use_native_dialogs:CONFIG -= no_rs_use_native_dialogs
 CONFIG *= rs_broadcast_discovery
 no_rs_broadcast_discovery:CONFIG -= rs_broadcast_discovery
 
-# To disable webui append the following assignation to qmake
-# command line "CONFIG+=rs_no_webui"
-CONFIG *= rs_webui
-rs_no_webui:CONFIG -= rs_webui
+# To enable webui append the following assignation to qmake
+# command line "CONFIG+=rs_webui"
+CONFIG *= rs_no_webui
+rs_webui:CONFIG -= rs_no_webui
 
 # To enable webui append the following assignation to qmake
 # command line "CONFIG+=rs_service_webui_terminal_password"