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

Fix QSqlQuery copy and Qt6 deprecation issues

Browse Source 
- Suppress deprecated QSqlQuery copy-constructor warning locally in NSqlQuery::operator=
- Replace qChecksum overload with QByteArrayView
- Use QTimeZone::utc(), QLibraryInfo::path(), check QTranslator::load return values
- Replace deprecated operator+ for key combinations and other small Qt6 fixes

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
torstenandCopilot committed 2026-07-14 23:32:33 +02:00
1 parent f7c94bed68
commit e1b5c2f918
7 files changed
+36 -20
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Z/src/nglwidgets/nglmainwindow.cpp
+3 -5
View File
@@ -20,12 +20,10 @@ NGLMainWindow::NGLMainWindow(QWidget *parent)
{
m_menu[QLatin1String("File")] = m_menuBar->addMenu(tr("File"));
m_fileActionBefore = m_menu[QLatin1String("File")]->addSeparator();
m_menu[QLatin1String("File")]->addAction(QIcon(QLatin1String(":/icons/16x16/application-exit.png")), tr("Quit"),
this, &NGLMainWindow::onExit, QKeySequence(tr("Ctrl+q")));
m_menu[QLatin1String("File")]->addAction(QIcon(QLatin1String(":/icons/16x16/application-exit.png")), tr("Quit"), QKeySequence(tr("Ctrl+q")), this, &NGLMainWindow::onExit);
m_menu[QLatin1String("Help")] = m_menuBar->addMenu(tr("Help"));
m_menu[QLatin1String("Help")]->addAction(QIcon(QLatin1String(":/icons/16x16/help-contents.png")),
tr("Help"), this, &NGLMainWindow::onHelpIndex, QKeySequence(tr("F1")));
m_menu[QLatin1String("Help")]->addAction(QIcon(QLatin1String(":/icons/16x16/help-contents.png")), tr("Help"), QKeySequence(tr("F1")), this, &NGLMainWindow::onHelpIndex);
m_menu[QLatin1String("Help")]->addSeparator();
m_menu[QLatin1String("Help")]->addAction(QIcon(QLatin1String(":/icons/16x16/help-about.png")),
tr("About"), this, &NGLMainWindow::onHelpAbout);
@@ -64,7 +62,7 @@ void NGLMainWindow::onInvokeHelp(const QString &helpContext)
<< QCoreApplication::applicationDirPath() + QLatin1String("/../help/scms/") + fn
<< QLatin1String("-enableRemoteControl");
DEBUG_LOG(m_logger) << "Attempting to invoke help at URL: " << args.join(QLatin1String(" ")) ;
m_helpProcess->start(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/assistant"), args);
m_helpProcess->start(QLibraryInfo::path(QLibraryInfo::BinariesPath) + QLatin1String("/assistant"), args);
if (!m_helpProcess->waitForStarted())
{
ERROR_LOG(m_logger) << "Could not start help browser (error: "
Z/src/nglwidgets/nglstandardbutton.cpp
+1 -1
View File
@@ -48,7 +48,7 @@ void NGLStandardButton::setType(StandardButton t)
case Send:
iconName = ":icons/svg/messages.svg";
text = tr("&Send");
key = QKeySequence(Qt::CTRL + Qt::Key_Return);
key = QKeySequence(Qt::CTRL | Qt::Key_Return);
objectName = "btnSend";
break;
case New: