From 7d2715401fb942ee103c9aa60b057a361e236ad1 Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@koefferlein.de>
Date: Thu, 30 Jul 2020 23:59:08 +0200
Subject: [PATCH 1/2] Fixed compile issue with some gcc's

---
 src/laybasic/laybasic/layNetlistBrowserModel.cc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/laybasic/laybasic/layNetlistBrowserModel.cc b/src/laybasic/laybasic/layNetlistBrowserModel.cc
index 5e4934951..ccc3e7ed3 100644
--- a/src/laybasic/laybasic/layNetlistBrowserModel.cc
+++ b/src/laybasic/laybasic/layNetlistBrowserModel.cc
@@ -1325,7 +1325,7 @@ NetlistModelItemData::child (size_t n)
 std::pair<const db::Circuit *, const db::Circuit *>
 NetlistModelItemData::circuits_of_this ()
 {
-  return std::pair<const db::Circuit *, const db::Circuit *> (0, 0);
+  return std::pair<const db::Circuit *, const db::Circuit *> ((const db::Circuit *) 0, (const db::Circuit *) 0);
 }
 
 std::pair<const db::Circuit *, const db::Circuit *>
@@ -1356,7 +1356,7 @@ NetlistModelItemData::derived_from_circuits (const std::pair<const db::Circuit *
 std::pair<const db::Device *, const db::Device *>
 NetlistModelItemData::devices_of_this ()
 {
-  return std::pair<const db::Device *, const db::Device *> (0, 0);
+  return std::pair<const db::Device *, const db::Device *> ((const db::Device *) 0, (const db::Device *) 0);
 }
 
 std::pair<const db::Device *, const db::Device *>
@@ -1387,7 +1387,7 @@ NetlistModelItemData::derived_from_devices (const std::pair<const db::Device *,
 std::pair<const db::Pin *, const db::Pin *>
 NetlistModelItemData::pins_of_this ()
 {
-  return std::pair<const db::Pin *, const db::Pin *> (0, 0);
+  return std::pair<const db::Pin *, const db::Pin *> ((const db::Pin *) 0, (const db::Pin *) 0);
 }
 
 std::pair<const db::Pin *, const db::Pin *>
@@ -1418,7 +1418,7 @@ NetlistModelItemData::derived_from_pins (const std::pair<const db::Pin *, const
 std::pair<const db::SubCircuit *, const db::SubCircuit *>
 NetlistModelItemData::subcircuits_of_this ()
 {
-  return std::pair<const db::SubCircuit *, const db::SubCircuit *> (0, 0);
+  return std::pair<const db::SubCircuit *, const db::SubCircuit *> ((const db::SubCircuit *) 0, (const db::SubCircuit *) 0);
 }
 
 std::pair<const db::SubCircuit *, const db::SubCircuit *>
@@ -1449,7 +1449,7 @@ NetlistModelItemData::derived_from_subcircuits (const std::pair<const db::SubCir
 std::pair<const db::Net *, const db::Net *>
 NetlistModelItemData::nets_of_this ()
 {
-  return std::pair<const db::Net *, const db::Net *> (0, 0);
+  return std::pair<const db::Net *, const db::Net *> ((const db::Net *) 0, (const db::Net *) 0);
 }
 
 std::pair<const db::Net *, const db::Net *>

From f2b678cb7bda00e3edffd01558b7be45fe9912a9 Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@koefferlein.de>
Date: Fri, 31 Jul 2020 00:15:38 +0200
Subject: [PATCH 2/2] Fixed master builds on Qt 4

---
 src/laybasic/laybasic/layNetlistBrowserModel.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/laybasic/laybasic/layNetlistBrowserModel.cc b/src/laybasic/laybasic/layNetlistBrowserModel.cc
index ccc3e7ed3..b69e2375a 100644
--- a/src/laybasic/laybasic/layNetlistBrowserModel.cc
+++ b/src/laybasic/laybasic/layNetlistBrowserModel.cc
@@ -31,7 +31,9 @@
 #include <QWidget>
 #include <QTreeView>
 #include <QUrl>
-#include <QUrlQuery>
+#if QT_VERSION >= 0x050000
+#  include <QUrlQuery>
+#endif
 
 namespace lay
 {