1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-04 01:48:54 +00:00

Add upstream patch to fix the build with Qt 5.10.

/wrkdirs/usr/ports/emulators/mgba/work/mgba-0.6.1/src/platform/qt/MemoryModel.cpp:102:15: error: no viable overloaded '='
            m_regionName = name;
            ~~~~~~~~~~~~ ^ ~~~~

PR:		228213
This commit is contained in:
Raphael Kubo da Costa 2018-05-15 15:13:11 +00:00
parent 051ea9a757
commit 72644a1a46
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=470024

View File

@ -0,0 +1,21 @@
From e31373560535203d826687044290a4994706c2dd Mon Sep 17 00:00:00 2001
From: ilovezfs <ilovezfs@icloud.com>
Date: Mon, 11 Dec 2017 00:39:32 -0800
Subject: [PATCH] Qt: Fix build with Qt 5.10
Fixes "MemoryModel.cpp:102:15: error: no viable overloaded '='"
---
src/platform/qt/MemoryModel.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- src/platform/qt/MemoryModel.cpp
+++ src/platform/qt/MemoryModel.cpp
@@ -99,7 +99,7 @@ void MemoryModel::setRegion(uint32_t base, uint32_t size, const QString& name, i
m_top = 0;
m_base = base;
m_size = size;
- m_regionName = name;
+ m_regionName = QStaticText(name);
m_regionName.prepare(QTransform(), m_font);
m_currentBank = segment;
verticalScrollBar()->setRange(0, (size >> 4) + 1 - viewport()->size().height() / m_cellHeight);