Merge branch 'master' of gitlab.com:SymbioticEDA/nextpnr into q3k/lock-2-electric-boogaloo

2 files changed, 15 insertions, 0 deletions

diff --git a/3rdparty/QtPropertyBrowser/src/qttreepropertybrowser.cpp b/3rdparty/QtPropertyBrowser/src/qttreepropertybrowser.cpp
index a92ab537..673252d2 100644
--- a/3rdparty/QtPropertyBrowser/src/qttreepropertybrowser.cpp
+++ b/3rdparty/QtPropertyBrowser/src/qttreepropertybrowser.cpp
@@ -74,6 +74,7 @@ public:
     QtProperty *indexToProperty(const QModelIndex &index) const;
     QTreeWidgetItem *indexToItem(const QModelIndex &index) const;
     QtBrowserItem *indexToBrowserItem(const QModelIndex &index) const;
+    QtBrowserItem *itemToBrowserItem(QTreeWidgetItem *item) const { return m_itemToIndex.value(item); };
     bool lastColumn(int column) const;
     void disableItem(QTreeWidgetItem *item) const;
     void enableItem(QTreeWidgetItem *item) const;
@@ -1068,6 +1069,16 @@ void QtTreePropertyBrowser::editItem(QtBrowserItem *item)
     d_ptr->editItem(item);
 }
 
+QTreeWidget *QtTreePropertyBrowser::treeWidget() const
+{
+    return d_ptr->treeWidget();
+}
+
+QtBrowserItem *QtTreePropertyBrowser::itemToBrowserItem(QTreeWidgetItem *item)
+{
+    return d_ptr->itemToBrowserItem(item);
+}
+
 #if QT_VERSION >= 0x040400
 QT_END_NAMESPACE
 #endif
diff --git a/3rdparty/QtPropertyBrowser/src/qttreepropertybrowser.h b/3rdparty/QtPropertyBrowser/src/qttreepropertybrowser.h
index c5f7fa88..7bc96b69 100644
--- a/3rdparty/QtPropertyBrowser/src/qttreepropertybrowser.h
+++ b/3rdparty/QtPropertyBrowser/src/qttreepropertybrowser.h
@@ -47,6 +47,7 @@
 QT_BEGIN_NAMESPACE
 #endif
 
+class QTreeWidget;
 class QTreeWidgetItem;
 class QtTreePropertyBrowserPrivate;
 
@@ -107,6 +108,9 @@ public:
 
     void editItem(QtBrowserItem *item);
 
+    //ADDED:miodrag
+    QTreeWidget *treeWidget() const;
+    QtBrowserItem *itemToBrowserItem(QTreeWidgetItem *item);
 Q_SIGNALS:
 
     void collapsed(QtBrowserItem *item);