aboutsummaryrefslogtreecommitdiff
path: root/emulators/mgba
diff options
context:
space:
mode:
Diffstat (limited to 'emulators/mgba')
-rw-r--r--emulators/mgba/files/patch-git_e313735621
1 files changed, 21 insertions, 0 deletions
diff --git a/emulators/mgba/files/patch-git_e3137356 b/emulators/mgba/files/patch-git_e3137356
new file mode 100644
index 000000000000..efd78b3c77b4
--- /dev/null
+++ b/emulators/mgba/files/patch-git_e3137356
@@ -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);