From 760c57a843d20de94c08b66720281fe4b5c671b5 Mon Sep 17 00:00:00 2001
From: Ivan Pelipenko <peri4ko@yandex.ru>
Date: Thu, 9 Jul 2020 13:11:23 +0300
Subject: [PATCH 1/3] FindQAD multiple add target fix

---
 qad/cmake/FindQAD.cmake | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/qad/cmake/FindQAD.cmake b/qad/cmake/FindQAD.cmake
index 59bb11e..776aecf 100644
--- a/qad/cmake/FindQAD.cmake
+++ b/qad/cmake/FindQAD.cmake
@@ -101,21 +101,23 @@ foreach(_Q ${_QAD_LIBS})
 	set(_target QAD::${_ITN_${_Q}})
 	string(REPLACE ":" "_" _target_str "${_target}")
 	foreach(_v ${_QT_VERSIONS_})
-		set(_link_list)
-		foreach(_l ${_ITLL_${_Q}})
-			list(APPEND _link_list ${_l}${_v})
-		endforeach()
-		add_library(${_target}${_v} UNKNOWN IMPORTED)
-		set_target_properties(${_target}${_v} PROPERTIES
-			IMPORTED_LOCATION "${QAD${_v}_${_QU}_LIBRARY}"
-			INTERFACE_INCLUDE_DIRECTORIES "${QAD_INCLUDES}"
-			INTERFACE_LINK_LIBRARIES "${_link_list}")
-		set(MULTILIB_${_target_str}_SUFFIX_Qt${_v} ${_v})
-		if(hasParent)
-			set(MULTILIB_${_target_str}_SUFFIX_Qt${_v} ${_v} PARENT_SCOPE)
+		if(NOT TARGET ${_target}${_v})
+			set(_link_list)
+			foreach(_l ${_ITLL_${_Q}})
+				list(APPEND _link_list ${_l}${_v})
+			endforeach()
+			add_library(${_target}${_v} UNKNOWN IMPORTED)
+			set_target_properties(${_target}${_v} PROPERTIES
+				IMPORTED_LOCATION "${QAD${_v}_${_QU}_LIBRARY}"
+				INTERFACE_INCLUDE_DIRECTORIES "${QAD_INCLUDES}"
+				INTERFACE_LINK_LIBRARIES "${_link_list}")
+			set(MULTILIB_${_target_str}_SUFFIX_Qt${_v} ${_v})
+			if(hasParent)
+				set(MULTILIB_${_target_str}_SUFFIX_Qt${_v} ${_v} PARENT_SCOPE)
+			endif()
+			#message(STATUS "add imported ${_target}${_v}")
+			#message(STATUS "add MULTILIB MULTILIB_${_target_str}_SUFFIX_Qt${_v} ${_v}")
 		endif()
-		#message(STATUS "add imported ${_target}${_v}")
-		#message(STATUS "add MULTILIB MULTILIB_${_target_str}_SUFFIX_Qt${_v} ${_v}")
 	endforeach()
 	list(APPEND QT_MULTILIB_LIST ${_target})
 endforeach()

From c359ba34a634e4c395c0fafddf6f6317bb7b300e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?=
 =?UTF-8?q?=D1=80=D0=B5=D0=B9?= <wapmobil@gmail.com>
Date: Thu, 9 Jul 2020 22:25:46 +0300
Subject: [PATCH 2/3] update pip

---
 pip | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pip b/pip
index 2dfbbf8..6143700 160000
--- a/pip
+++ b/pip
@@ -1 +1 @@
-Subproject commit 2dfbbf80b768e5477fb39dffb5ab58f61c43521d
+Subproject commit 614370096cc0a2deb45790b69d27eada2fe237e0

From a49aeda257ed8d5d7ebcdd6758f2a1a9efc8a1dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?=
 =?UTF-8?q?=D1=80=D0=B5=D0=B9?= <wapmobil@gmail.com>
Date: Fri, 10 Jul 2020 21:46:36 +0300
Subject: [PATCH 3/3] fix qad_export.h

---
 qad/qad_export.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qad/qad_export.h b/qad/qad_export.h
index 3d40d96..1f7e882 100644
--- a/qad/qad_export.h
+++ b/qad/qad_export.h
@@ -3,7 +3,7 @@
 
 #include <QtCore/QtGlobal>
 
-#if defined(QAD_STATIC_DEFINE) || defined(Q_CC_GNU) || defined(DOXYGEN)
+#if defined(QAD_STATIC_DEFINE) || defined(DOXYGEN)
 #  define QAD_EXPORT
 #else
 #  ifdef QAD_SHARED_DEFINE