Merge story/release-validation-scope
Bring the validation-scope line (in-tree Jenkins CI copy, lcov coverage wiring, step-by-step release-scope README, TetraIF unit tests, the LogView runtime icon/resource fix, Dockerfile, rpmbuild and the new_docker_build.sh driver with the DEB output path) on top of the XmlPatterns branch pruned to the Release 2 scope. Conflict policy: - Out-of-scope targets/modules: keep the prune (deletion wins). - In-scope files that validation had deleted: restored from story/release-2-cleanup (the Release 2 closure, with the pruned-module guards). - In-scope sources carrying migration work: XmlPatterns versions (Qt XmlPatterns rework on QDomDocument, DDS member and logger fixes, first-build fixes). - Scope-aware CMakeLists (top level, PluginInterfaces, LtsWidgets) and .envrc: story/release-2-cleanup / ours versions.
This commit is contained in:
commit
cfe15c72c4
521 files changed
+37159
-36635
No files matched your search
@@ -4,65 +4,9 @@
|
||||
# $Author$
|
||||
#
|
||||
|
||||
ADD_SUBDIRECTORY(Adler)
|
||||
ADD_SUBDIRECTORY(AsmWorkstationCertifier)
|
||||
ADD_SUBDIRECTORY(CnrProxyTester)
|
||||
ADD_SUBDIRECTORY(ConfigX)
|
||||
ADD_SUBDIRECTORY(DataSampleGenerator)
|
||||
ADD_SUBDIRECTORY(DataSampleReceiver)
|
||||
ADD_SUBDIRECTORY(DBAdministration)
|
||||
ADD_SUBDIRECTORY(DBOperatorSettingsRemover)
|
||||
# Release 2 Tools modules (S set: DdsView, LogViewer, SqlBrowser + TopicDiscover)
|
||||
ADD_SUBDIRECTORY(DdsView)
|
||||
ADD_SUBDIRECTORY(DotMatrixDisplay)
|
||||
ADD_SUBDIRECTORY(EEMFakeServer)
|
||||
ADD_SUBDIRECTORY(LicenceEditor)
|
||||
ADD_SUBDIRECTORY(LocalDomainFinder)
|
||||
#ADD_SUBDIRECTORY(LoginTest)
|
||||
ADD_SUBDIRECTORY(LogViewer)
|
||||
ADD_SUBDIRECTORY(ParticipantDataGenerator)
|
||||
ADD_SUBDIRECTORY(ProjectSettingsEditor)
|
||||
ADD_SUBDIRECTORY(QLedLine)
|
||||
ADD_SUBDIRECTORY(QLedMatrix)
|
||||
ADD_SUBDIRECTORY(RestClientUi)
|
||||
ADD_SUBDIRECTORY(ScreenIdShow)
|
||||
ADD_SUBDIRECTORY(SerialToTcpConverter)
|
||||
ADD_SUBDIRECTORY(Splash)
|
||||
ADD_SUBDIRECTORY(SqlBrowser)
|
||||
ADD_SUBDIRECTORY(DateTimeSyncer)
|
||||
ADD_SUBDIRECTORY(Times)
|
||||
ADD_SUBDIRECTORY(TopicDiscover)
|
||||
ADD_SUBDIRECTORY(VapixConfig)
|
||||
ADD_SUBDIRECTORY(Automount)
|
||||
ADD_SUBDIRECTORY(EgcuSimulator)
|
||||
ADD_SUBDIRECTORY(TextEditorTest)
|
||||
#ADD_SUBDIRECTORY(Examples/Plugins)
|
||||
ADD_SUBDIRECTORY(Examples/TestGuiElement)
|
||||
|
||||
#ADD_SUBDIRECTORY(VideoImport)
|
||||
ADD_SUBDIRECTORY(VulnerabilityStateGenerator)
|
||||
IF (BUILD_WLS)
|
||||
ADD_SUBDIRECTORY(WlsRandomPositions)
|
||||
ENDIF()
|
||||
|
||||
IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
|
||||
ADD_SUBDIRECTORY(InfrastructureManagement)
|
||||
ADD_SUBDIRECTORY(WirelessLocationTools)
|
||||
ENDIF()
|
||||
|
||||
IF (BUILD_TOOLSSV)
|
||||
ADD_SUBDIRECTORY(DBUpdate)
|
||||
ENDIF()
|
||||
|
||||
SET(SCRIPTS
|
||||
startDDSSpy
|
||||
check_start_services
|
||||
)
|
||||
NGL_INSTALL(AAR SV PROGRAMS ${SCRIPTS} DESTINATION bin)
|
||||
|
||||
SET(SCRIPTS_2
|
||||
remove_old_coredumps
|
||||
)
|
||||
NGL_INSTALL(AAR SV WS PROGRAMS ${SCRIPTS_2} DESTINATION bin)
|
||||
|
||||
NGL_INSTALL(AAR WS DIRECTORY "THP2" DESTINATION "share/Lts/")
|
||||
NGL_INSTALL(AAR WS DIRECTORY "THP-overview" DESTINATION "share/Lts/")
|
||||
# Excluded from Release 2: Adler, AsmWorkstationCertifier, CnrProxyTester, ConfigX, DataSampleReceiver, DBAdministration, DBOperatorSettingsRemover, DotMatrixDisplay, EEMFakeServer, LicenceEditor, LocalDomainFinder, LoginTest, ProjectSettingsEditor, QLedLine, QLedMatrix, RestClientUi, ScreenIdShow, SerialToTcpConverter, Splash, DateTimeSyncer, Times, VapixConfig, Automount, EgcuSimulator, TextEditorTest, Examples/Plugins, Examples/TestGuiElement, VideoImport, InfrastructureManagement, WirelessLocationTools, DBUpdate, WlsRandomPositions
|
||||
@@ -64,3 +64,8 @@ if(QT6_GUI_AVAILABLE)
|
||||
endif()
|
||||
|
||||
NGL_INSTALL_TARGET(LogViewer)
|
||||
|
||||
#
|
||||
# Unit tests
|
||||
#
|
||||
ADD_SUBDIRECTORY(unit-test)
|
||||
@@ -10,7 +10,7 @@
|
||||
#include "logviewtableview.h"
|
||||
#include "logviewtablemodel.h"
|
||||
|
||||
#include <QtGui/QAction> // Qt6: QAction moved from QtWidgets to QtGui
|
||||
#include <QtGui/QAction> // QAction moved to QtGui
|
||||
#include <QtGui/QColor>
|
||||
#include <QColorDialog>
|
||||
#include <QtGui/QIcon>
|
||||
|
||||
@@ -17,8 +17,7 @@ void SortFilterModel::setStartDateFilter(const QDateTime &start)
|
||||
if (m_start == start)
|
||||
return;
|
||||
m_start = start;
|
||||
beginFilterChange();
|
||||
endFilterChange();
|
||||
invalidateFilter();
|
||||
}
|
||||
|
||||
|
||||
@@ -27,8 +26,7 @@ void SortFilterModel::setEndDateFilter(const QDateTime &end)
|
||||
if (m_end == end)
|
||||
return;
|
||||
m_end = end;
|
||||
beginFilterChange();
|
||||
endFilterChange();
|
||||
invalidateFilter();
|
||||
}
|
||||
|
||||
void SortFilterModel::figureFilterOut()
|
||||
@@ -43,8 +41,7 @@ void SortFilterModel::resetAllFilter()
|
||||
m_start = QDateTime();
|
||||
m_end = QDateTime();
|
||||
figureFilterOut();
|
||||
beginFilterChange();
|
||||
endFilterChange();
|
||||
invalidateFilter();
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -61,3 +61,8 @@ if(QT6_GUI_AVAILABLE)
|
||||
)
|
||||
endif()
|
||||
NGL_INSTALL_TARGET(sqlbrowser)
|
||||
|
||||
#
|
||||
# Unit tests
|
||||
#
|
||||
ADD_SUBDIRECTORY(unit-test)
|
||||
Reference in new issue
Block a user