Fix Qt6 compatibility issues and exclude tests from release build
- tests/CMakeLists.txt: Wrap migration_tests in RELEASE_BUILD conditional - LogViewModels.cpp: Change BackgroundColorRole to BackgroundRole for Qt6 - LogViewField.hpp/cpp: Add m_logger member variable - LogViewInjectionThread.hpp/cpp: Add m_logger member variable - LogViewGui.hpp/cpp: Add m_logger member variable, fix QString::split() usage - LogViewTetraTelegramsParser.hpp: Add m_logger, change QStringRef to QStringView - LogViewTelegramEdit.hpp: Fix QModelIndex include path (QtGui→QtCore) - LogViewModels.hpp: Fix QAbstractTableModel include path (QtGui→QtCore) - PrtCnv/CMakeLists.txt: Add CMAKE_CURRENT_BINARY_DIR for export header, exclude LastTest from release - CoPrtCnv/CMakeLists.txt: Add PrtCnv include paths for prtcnvlib_export.h - Lts/Common/CodeGen/CMakeLists.txt: Add CMAKE_CURRENT_BINARY_DIR for export header - Lts/Proxies/TrainingAreaBase/Plugins/CMakeLists.txt: Exclude WlsTetra from release scope Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
15 files changed
+31
-12
No files matched your search
@@ -72,6 +72,7 @@ LogViewGui::LogViewGui(QWidget* a_parent)
|
||||
, m_InjectionThread(nullptr)
|
||||
, m_replayTimer(new QTimer(this))
|
||||
, m_currentReplayRow(-1)
|
||||
, m_logger(getLogger("LogViewGui"))
|
||||
{
|
||||
setWindowIcon(QIcon(QLatin1String(":icons/16x16/rde_16x16.png")));
|
||||
|
||||
@@ -655,10 +656,10 @@ void LogViewGui::updateLogfile()
|
||||
|
||||
QString filePath(fileInfo.absolutePath() + QLatin1Char('/'));
|
||||
const QString baseName = fileInfo.baseName();
|
||||
const QVector<QStringView> parts = baseName.splitView(QLatin1Char('_'));
|
||||
const QVector<QString> parts = baseName.split(QLatin1Char('_'));
|
||||
|
||||
for (int iterator = 0; iterator < parts.size() - 2; ++iterator)
|
||||
filePath += parts.at(iterator).toString() + QLatin1Char('_');
|
||||
filePath += parts.at(iterator) + QLatin1Char('_');
|
||||
|
||||
QString nextFile(filePath + nextDate + QLatin1Char('.') + fileInfo.completeSuffix());
|
||||
QString checkFile(filePath + checkDate + QLatin1Char('.') + fileInfo.completeSuffix());
|
||||
@@ -912,9 +913,9 @@ void LogViewGui::startInjectionThread()
|
||||
settings.beginGroup(QLatin1String("LogFiles"));
|
||||
QString filePath = settings.value(QLatin1String("Dir")).toString();
|
||||
QString exerciseName;
|
||||
QVector<QStringView> parts = filePath.splitView(QLatin1Char('/'));
|
||||
QVector<QString> parts = filePath.split(QLatin1Char('/'));
|
||||
if (parts.size() >= 2)
|
||||
exerciseName = QLatin1Char('_') + parts.at(parts.size() - 2).toString();
|
||||
exerciseName = QLatin1Char('_') + parts.at(parts.size() - 2);
|
||||
|
||||
QString portFilePath = QCoreApplication::applicationDirPath() + QDir::separator() + QLatin1String("PrtCnv") + exerciseName + QLatin1String(".dat");
|
||||
QFileInfo checkPortFile(portFilePath);
|
||||
|
||||
Reference in new issue
Block a user