From 4354a76df94c26f2298380eb657712dc3e06b470 Mon Sep 17 00:00:00 2001
From: xiphon <xiphon@protonmail.com>
Date: Fri, 1 May 2020 12:22:49 +0000
Subject: StandardDropdown: drop Qt 5.8 workaround

---
 components/StandardDropdown.qml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'components')

diff --git a/components/StandardDropdown.qml b/components/StandardDropdown.qml
index ad7da891..dfe37a5d 100644
--- a/components/StandardDropdown.qml
+++ b/components/StandardDropdown.qml
@@ -58,11 +58,6 @@ Item {
 
     onExpandedChanged: if(expanded) appWindow.currentItem = dropdown
 
-    // Workaroud for suspected memory leak in 5.8 causing malloc crash on app exit
-    function update() {
-        firstColText.text = columnid.currentIndex < repeater.model.rowCount() ? qsTr(repeater.model.get(columnid.currentIndex).column1) + translationManager.emptyString : ""
-    }
-
     Item {
         id: head
         anchors.left: parent.left
@@ -80,7 +75,6 @@ Item {
         }
 
         MoneroComponents.TextPlain {
-            id: firstColText
             anchors.verticalCenter: parent.verticalCenter
             anchors.left: parent.left
             anchors.leftMargin: 12
@@ -91,6 +85,7 @@ Item {
             font.bold: dropdown.headerFontBold
             font.pixelSize: dropdown.fontHeaderSize
             color: dropdown.textColor
+            text: columnid.currentIndex < repeater.model.count ? qsTr(repeater.model.get(columnid.currentIndex).column1) + translationManager.emptyString : ""
         }
 
         Item {
@@ -217,7 +212,6 @@ Item {
                                 popup.close()
                                 columnid.currentIndex = index
                                 changed();
-                                dropdown.update()
                             }
                         }
                     }
-- 
cgit v1.2.3