From 8b99cd0303bbb07a937955c1c453c5a91a3dfc05 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 9 Oct 2019 19:28:37 +0200
Subject: [PATCH] Add SKIPQT makefile var

---
 client/Makefile                               | 53 ++++++++++---------
 .../4_Advanced-compilation-parameters.md      |  7 +++
 2 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/client/Makefile b/client/Makefile
index 71def6aae..95a258a78 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -77,36 +77,37 @@ else
 endif
 endif
 
-# Check for correctly configured Qt5
-QTINCLUDES = $(shell pkg-config --cflags Qt5Core Qt5Widgets 2>/dev/null)
-QTLDLIBS = $(shell pkg-config --libs Qt5Core Qt5Widgets 2>/dev/null)
-MOC = $(shell pkg-config --variable=host_bins Qt5Core)/moc
-UIC = $(shell pkg-config --variable=host_bins Qt5Core)/uic
-ifeq ($(QTINCLUDES), )
-# if Qt5 not found check for correctly configured Qt4
-    QTINCLUDES = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null)
-    QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
-    MOC = $(shell pkg-config --variable=moc_location QtCore)
-    UIC = $(shell pkg-config --variable=uic_location QtCore)
-else
-    PM3CXXFLAGS += -std=c++11 -fPIC
-endif
-ifeq ($(QTINCLUDES), )
-# if both pkg-config commands failed, search in common places
-    ifneq ($(QTDIR), )
-        QTINCLUDES = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
-        QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
-        ifneq ($(wildcard $(QTDIR)/include/QtWidgets),)
-            QTINCLUDES += -I$(QTDIR)/include/QtWidgets
-            QTLDLIBS = -L$(QTDIR)/lib -lQt5Widgets -lQt5Gui -lQt5Core
-            PM3CXXFLAGS += -std=c++11 -fPIC
+ifneq ($(SKIPQT),1)
+    # Check for correctly configured Qt5
+    QTINCLUDES = $(shell pkg-config --cflags Qt5Core Qt5Widgets 2>/dev/null)
+    QTLDLIBS = $(shell pkg-config --libs Qt5Core Qt5Widgets 2>/dev/null)
+    MOC = $(shell pkg-config --variable=host_bins Qt5Core)/moc
+    UIC = $(shell pkg-config --variable=host_bins Qt5Core)/uic
+    ifeq ($(QTINCLUDES), )
+    # if Qt5 not found check for correctly configured Qt4
+        QTINCLUDES = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null)
+        QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
+        MOC = $(shell pkg-config --variable=moc_location QtCore)
+        UIC = $(shell pkg-config --variable=uic_location QtCore)
+    else
+        PM3CXXFLAGS += -std=c++11 -fPIC
+    endif
+    ifeq ($(QTINCLUDES), )
+    # if both pkg-config commands failed, search in common places
+        ifneq ($(QTDIR), )
+            QTINCLUDES = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
+            QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
+            ifneq ($(wildcard $(QTDIR)/include/QtWidgets),)
+                QTINCLUDES += -I$(QTDIR)/include/QtWidgets
+                QTLDLIBS = -L$(QTDIR)/lib -lQt5Widgets -lQt5Gui -lQt5Core
+                PM3CXXFLAGS += -std=c++11 -fPIC
+            endif
+            MOC = $(QTDIR)/bin/moc
+            UIC = $(QTDIR)/bin/uic
         endif
-        MOC = $(QTDIR)/bin/moc
-        UIC = $(QTDIR)/bin/uic
     endif
 endif
 
-
 ifneq ($(QTLDLIBS),)
     QTGUIOBJS = $(OBJDIR)/proxgui.o $(OBJDIR)/proxguiqt.o $(OBJDIR)/proxguiqt.moc.o
     PM3CFLAGS += -DHAVE_GUI
diff --git a/doc/md/Use_of_Proxmark/4_Advanced-compilation-parameters.md b/doc/md/Use_of_Proxmark/4_Advanced-compilation-parameters.md
index b4fb4384a..977af704c 100644
--- a/doc/md/Use_of_Proxmark/4_Advanced-compilation-parameters.md
+++ b/doc/md/Use_of_Proxmark/4_Advanced-compilation-parameters.md
@@ -12,6 +12,13 @@ Via some definitions, you can adjust the firmware for a given platform, but also
 The client doesn't depend on the capabilities of the Proxmark3 it's connected to.
 So you can use the same client for different Proxmark3 platforms, given that everything is running the same version.
 
+It's possible to explicitly skip the Qt support in the compilation even if Qt is present on the host, with:
+
+```
+make clean
+make SKIPQT=1
+```
+
 ## Firmware
 
 By default, the firmware is of course tuned for the Proxmark3 Rdv4.0 device, which has built-in support for 256kb onboard flash SPI memory, Sim module (smart card support), FPC connector.