summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/modules/debugger/qt/deviceinformationwindow.cpp
diff options
context:
space:
mode:
author Michael Zapf <github@mizapf.de>2026-04-17 15:21:32 +0200
committer Michael Zapf <github@mizapf.de>2026-04-17 15:21:32 +0200
commitd3d82c776740320dc29eca249f8cd5b1ae4d1b40 (patch)
tree96d2ab1e717f8fa20f73713a95c3f4ce3fecb4e8 /src/osd/modules/debugger/qt/deviceinformationwindow.cpp
parent0b24b4c2f6052cea7d612408f4baa58ed63ee290 (diff)
parent0034dde186fa6f594125ac3dc2b5977f18e7a062 (diff)
Merge branch 'master' into floppysound
Diffstat (limited to 'src/osd/modules/debugger/qt/deviceinformationwindow.cpp')
-rw-r--r--src/osd/modules/debugger/qt/deviceinformationwindow.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/osd/modules/debugger/qt/deviceinformationwindow.cpp b/src/osd/modules/debugger/qt/deviceinformationwindow.cpp
index 2e06d8fb1ed..935d9f513fe 100644
--- a/src/osd/modules/debugger/qt/deviceinformationwindow.cpp
+++ b/src/osd/modules/debugger/qt/deviceinformationwindow.cpp
@@ -62,7 +62,7 @@ void DeviceInformationWindow::fill_device_information()
vLayout->setContentsMargins(2,2,2,2);
QFrame *primaryFrame = new QFrame(mainWindowFrame);
- primaryFrame->setFrameStyle(QFrame::StyledPanel | QFrame::Sunken);
+ primaryFrame->setFrameStyle(0 | QFrame::StyledPanel | QFrame::Sunken); // zero because C++20 doesn't allow arithmetic between different enums
QGridLayout *gl1 = new QGridLayout(primaryFrame);
gl1->addWidget(new QLabel(QString("Tag"), primaryFrame), 0, 0);
gl1->addWidget(new QLabel(QString(m_device->tag()), primaryFrame), 0, 1);
@@ -90,7 +90,7 @@ void DeviceInformationWindow::fill_device_information()
if (m_device->interface(d_memory))
{
QFrame *f = new QFrame(mainWindowFrame);
- f->setFrameStyle(QFrame::StyledPanel | QFrame::Sunken);
+ f->setFrameStyle(0 | QFrame::StyledPanel | QFrame::Sunken); // zero because C++20 doesn't allow arithmetic between different enums
QVBoxLayout *vb = new QVBoxLayout(f);
bool first = true;
for (int i=0; i<d_memory->max_space_count(); i++)