diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbconnection_screens.cpp | 9 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbscreen.cpp | 4 |
2 files changed, 3 insertions, 10 deletions
diff --git a/src/plugins/platforms/xcb/qxcbconnection_screens.cpp b/src/plugins/platforms/xcb/qxcbconnection_screens.cpp index 22285b836d3..0a45b1b0c9e 100644 --- a/src/plugins/platforms/xcb/qxcbconnection_screens.cpp +++ b/src/plugins/platforms/xcb/qxcbconnection_screens.cpp @@ -191,7 +191,7 @@ void QXcbConnection::updateScreens(const xcb_randr_notify_event_t *event) } } - qCDebug(lcQpaScreen) << "primary output is" << qAsConst(m_screens).first()->name(); + qCDebug(lcQpaScreen) << "updateScreens: primary output is" << qAsConst(m_screens).first()->name(); } } @@ -379,7 +379,7 @@ void QXcbConnection::initializeScreens(bool initialized) } if (!m_screens.isEmpty()) - qCDebug(lcQpaScreen) << "primary output is" << qAsConst(m_screens).first()->name(); + qCDebug(lcQpaScreen) << "initializeScreens: primary output is" << qAsConst(m_screens).first()->name(); } } @@ -534,11 +534,6 @@ void QXcbConnection::initializeScreensFromMonitor(xcb_screen_iterator_t *it, int siblings << screen; - if (primaryScreenNumber() == xcbScreenNumber) { - primaryScreen = screen; - primaryScreen->setPrimary(true); - } - xcb_randr_monitor_info_next(&monitor_iter); } diff --git a/src/plugins/platforms/xcb/qxcbscreen.cpp b/src/plugins/platforms/xcb/qxcbscreen.cpp index 6524397cef0..a474e569e92 100644 --- a/src/plugins/platforms/xcb/qxcbscreen.cpp +++ b/src/plugins/platforms/xcb/qxcbscreen.cpp @@ -705,9 +705,7 @@ void QXcbScreen::setMonitor(xcb_randr_monitor_info_t *monitorInfo, xcb_timestamp QByteArray ba = connection()->atomName(monitorInfo->name); m_outputName = getName(monitorInfo); - - if (monitorInfo->primary) - m_primary = true; + m_primary = monitorInfo->primary; m_cursor = new QXcbCursor(connection(), this); } |
