From 2302036d6f6bdb835f390f61d9a3b9004d32d128 Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@koefferlein.de>
Date: Mon, 6 May 2019 19:06:06 +0200
Subject: [PATCH] Fixed a compiler warning, build compatibility with Qt5

---
 src/laybasic/laybasic/layNetExportDialog.cc    |  2 +-
 src/laybasic/laybasic/layNetExportDialog.h     |  2 +-
 src/laybasic/laybasic/layNetlistBrowserPage.cc | 14 ++++++++++++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/laybasic/laybasic/layNetExportDialog.cc b/src/laybasic/laybasic/layNetExportDialog.cc
index af492624b..ec2b0cc89 100644
--- a/src/laybasic/laybasic/layNetExportDialog.cc
+++ b/src/laybasic/laybasic/layNetExportDialog.cc
@@ -165,7 +165,7 @@ END_PROTECTED
 }
 
 int
-NetExportDialog::exec (lay::PluginRoot *plugin_root)
+NetExportDialog::exec_dialog (lay::PluginRoot *plugin_root)
 {
   std::string v;
   plugin_root->config_get (cfg_l2ndb_export_net_cell_prefix, v);
diff --git a/src/laybasic/laybasic/layNetExportDialog.h b/src/laybasic/laybasic/layNetExportDialog.h
index 696ccf867..4d9149cd8 100644
--- a/src/laybasic/laybasic/layNetExportDialog.h
+++ b/src/laybasic/laybasic/layNetExportDialog.h
@@ -74,7 +74,7 @@ public:
   void set_start_layer_number (int ln);
   int start_layer_number ();
 
-  int exec (lay::PluginRoot *mp_plugin_root);
+  int exec_dialog (lay::PluginRoot *mp_plugin_root);
 
 protected:
   void accept ();
diff --git a/src/laybasic/laybasic/layNetlistBrowserPage.cc b/src/laybasic/laybasic/layNetlistBrowserPage.cc
index 15b46a86c..5d486d704 100644
--- a/src/laybasic/laybasic/layNetlistBrowserPage.cc
+++ b/src/laybasic/laybasic/layNetlistBrowserPage.cc
@@ -41,6 +41,9 @@
 #include <QColorDialog>
 #include <QRegExp>
 #include <QKeyEvent>
+#if QT_VERSION >= 0x050000
+#  include <QUrlQuery>
+#endif
 
 namespace lay
 {
@@ -267,7 +270,14 @@ void
 NetlistBrowserPage::anchor_clicked (const QString &a)
 {
   QUrl url (a);
-  QString ids = url.queryItemValue (QString::fromUtf8 ("id"));
+
+  QString ids;
+#if QT_VERSION >= 0x050000
+  ids = QUrlQuery (url.query ()).queryItemValue (QString::fromUtf8 ("id"));
+#else
+  ids = url.queryItemValue (QString::fromUtf8 ("id"));
+#endif
+
   if (ids.isEmpty ()) {
     return;
   }
@@ -1036,7 +1046,7 @@ NetlistBrowserPage::export_nets (const std::vector<const db::Net *> *nets)
   const db::Cell &source_top = source_layout.cell (*source_layout.begin_top_down ());
 
   std::auto_ptr<lay::NetExportDialog> dialog (new lay::NetExportDialog (this));
-  if (dialog->exec (mp_plugin_root)) {
+  if (dialog->exec_dialog (mp_plugin_root)) {
 
     //  NOTE: mp_view and database might get reset to 0 in create_layout
     lay::LayoutView *view = mp_view;