Merge remote-tracking branch 'benma/rem-envvar'

jadzeidan · Oct 19, 2022 · 37c5587 · 37c5587
2 parents 1e1e2c6 + d739c60
commit 37c5587
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 10 deletions.
diff --git a/frontends/qt/BitBox.pro b/frontends/qt/BitBox.pro
@@ -44,12 +44,6 @@ win32 {
     QMAKE_CXXFLAGS += $$CMISC
 }
 
-# Pass on env var as a define.
-QT_BITBOX_ALLOW_EXTERNAL_URLS = $$(QT_BITBOX_ALLOW_EXTERNAL_URLS)
-equals(QT_BITBOX_ALLOW_EXTERNAL_URLS, 1) {
-    DEFINES += QT_BITBOX_ALLOW_EXTERNAL_URLS
-}
-
 # https://stackoverflow.com/questions/18462420/how-to-specify-mac-platform-in-qmake-qtcreator
 unix:!macx {
     QMAKE_LFLAGS_RPATH=

diff --git a/frontends/qt/main.cpp b/frontends/qt/main.cpp
@@ -104,10 +104,6 @@ class RequestInterceptor : public QWebEngineUrlRequestInterceptor {
 public:
     explicit RequestInterceptor() : QWebEngineUrlRequestInterceptor() { }
     void interceptRequest(QWebEngineUrlRequestInfo& info) override {
-#ifdef QT_BITBOX_ALLOW_EXTERNAL_URLS
-        // Do not block anything.
-        return;
-#endif
         // Do not block qrc:/ local pages or js blobs
         if (info.requestUrl().scheme() == "qrc" || info.requestUrl().scheme() == "blob") {
             return;