lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QDesktopWidget → QScreen: Complete migration in AVM and TetraIF modules

Browse Source 
- avm_mvs_video_team_gui_plugin.cpp: QApplication::desktop() → QGuiApplication::primaryScreen()
- LogViewTelegramDialog.cpp: QApplication::desktop() → QGuiApplication::primaryScreen()
- Added QGuiApplication includes where needed
- Removed duplicate QScreen include

This completes the QDesktopWidget API migration across all modules.
QApplication::desktop() is deprecated in Qt5 and removed in Qt6.
Replacement: QGuiApplication::primaryScreen()->geometry() or availableGeometry().

Refs: Qt6 migration, C++17 constraint due to RTI Connext DDS 7.7.0 incompatibility
This commit is contained in:
torsten committed 2026-08-24 20:28:34 +02:00
1 parent f15f342a47
commit bf0b1a3ddd
2 files changed
+4 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_video_team_gui_plugin.cpp
+2 -2
View File
@@ -11,8 +11,8 @@
#include <LtsUtilsSettings/settings.h> #include <LtsUtilsSettings/settings.h>
#include <QtWidgets/QApplication> #include <QtWidgets/QApplication>
#include <QtGui/QScreen> #include <QtGui/QScreen>
#include <QtGui/QGuiApplication>
#include <QtCore/QProcess> #include <QtCore/QProcess>
#include <QtGui/QScreen>
namespace AudioVideoManagement namespace AudioVideoManagement
{ {
@@ -116,7 +116,7 @@ LtsWidgets::LtsDialog *InterfaceImpl::onMvsRemoteDesktop(const QString &rdesktop
LtsUtils::ProjectSettings *ps = LtsUtils::ProjectSettings::getInstance(); LtsUtils::ProjectSettings *ps = LtsUtils::ProjectSettings::getInstance();
const QString username = ps->value(QStringLiteral("avm"), QStringLiteral("mvsUser")).toString(); const QString username = ps->value(QStringLiteral("avm"), QStringLiteral("mvsUser")).toString();
const QString password = ps->value(QStringLiteral("avm"), QStringLiteral("mvsPassword")).toString(); const QString password = ps->value(QStringLiteral("avm"), QStringLiteral("mvsPassword")).toString();
QSize s = QApplication::desktop()->screenGeometry(parent).size(); QSize s = QGuiApplication::primaryScreen()->geometry().size();
if (s.isEmpty()) if (s.isEmpty())
s = QSize(1920, 1080); s = QSize(1920, 1080);
s = s * 7 / 8; s = s * 7 / 8;
qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramDialog.cpp
+2 -1
View File
@@ -16,6 +16,7 @@
#include "LogViewTelegram.hpp" #include "LogViewTelegram.hpp"
#include <QtWidgets/QApplication> #include <QtWidgets/QApplication>
#include <QtGui/QScreen> #include <QtGui/QScreen>
#include <QtGui/QGuiApplication>
#include <QtCore/QDir> #include <QtCore/QDir>
#include <QtWidgets/QFileDialog> #include <QtWidgets/QFileDialog>
#include <QtWidgets/QGroupBox> #include <QtWidgets/QGroupBox>
@@ -173,7 +174,7 @@ void LogViewTelegramDialog::makePretty()
int sbWidth = m_ScrollArea->width() - m_ScrollArea->viewport()->width(); int sbWidth = m_ScrollArea->width() - m_ScrollArea->viewport()->width();
int wDiff = m_contentsWidget->width() - m_ScrollArea->width(); int wDiff = m_contentsWidget->width() - m_ScrollArea->width();
int hDiff = m_contentsWidget->height() - m_ScrollArea->viewport()->height(); int hDiff = m_contentsWidget->height() - m_ScrollArea->viewport()->height();
const QRect screenSize = QApplication::desktop()->screenGeometry(this); const QRect screenSize = QGuiApplication::primaryScreen()->geometry();
int newWidth = std::min(width() + wDiff + sbWidth, screenSize.width() * 9 / 10); int newWidth = std::min(width() + wDiff + sbWidth, screenSize.width() * 9 / 10);
int newHeight = std::min(height() + hDiff, screenSize.height() * 9 / 10); int newHeight = std::min(height() + hDiff, screenSize.height() * 9 / 10);