Major Changes:
- Merged latest Qt5 devel content from dlbo (292 files changed, 7 new dirs)
- Consolidated forward-declarations and include folders
- Removed unneeded modules per Niklas' repo check list
Build System Fixes:
- Fixed CMake VERSION_GREATER syntax in ParticipantManagement/CMakeLists.txt
- Added VLC packages (libvlc-dev, vlc-plugin-base) to docker_build.sh
- Added PostgreSQL dev packages (libpq-dev, postgresql-server-dev-all) to Dockerfile
- Fixed locale warnings (ANSI_X3.4-1968 → C.UTF-8)
- Fixed ArcGIS SDK path warnings when BUILD_ARCGIS=OFF
Code Generation Fixes:
- Fixed IDL enum collisions (PortType→CorePortType/DdsutPortType, PdmEventType)
- Fixed Grantlee template svc_translation.cpp.grantlee:
- Changed {{ idl_enum.name }}_def:: to {{ idl_enum.name }}::
- Fixed .underlying() calls for C++11 scoped enums (enum class)
- Removed generated files from repo (moc_*, *_dtc.h, *_ftc.h)
Validation:
- BUILD_RTI=ON: SUCCESS
- BUILD_RTI=OFF: SUCCESS
- C++17 standard maintained for RTI 7.7 compatibility
- Ubuntu 26.04 Docker environment verified
Remaining Warnings (expected):
- BgViewer, KDChart, KDReports, Poppler-Qt6 not found (optional features)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
127 lines
3.3 KiB
XML
127 lines
3.3 KiB
XML
<?xml version="1.0" encoding="UTF-8"?>
|
|
<ui version="4.0">
|
|
<class>LicenceEdit</class>
|
|
<widget class="NGLDialog" name="LicenceEdit">
|
|
<property name="windowTitle">
|
|
<string>Licence Data</string>
|
|
</property>
|
|
<property name="title" stdset="0">
|
|
<string>Settings</string>
|
|
</property>
|
|
<layout class="QGridLayout" name="gridLayout">
|
|
<item row="8" column="0" colspan="3">
|
|
<widget class="NGLDialogButtonBox" name="nglDialogButtonBox">
|
|
<property name="standardButtons">
|
|
<set>NGLStandardButton::Cancel|NGLStandardButton::Ok</set>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="3" column="1" colspan="2">
|
|
<widget class="QSpinBox" name="sbMaxCount">
|
|
<property name="minimum">
|
|
<number>1</number>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="5" column="2">
|
|
<widget class="QTimeEdit" name="timeEdit">
|
|
<property name="dateTime">
|
|
<datetime>
|
|
<hour>0</hour>
|
|
<minute>0</minute>
|
|
<second>0</second>
|
|
<year>2000</year>
|
|
<month>1</month>
|
|
<day>1</day>
|
|
</datetime>
|
|
</property>
|
|
<property name="calendarPopup">
|
|
<bool>true</bool>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="6" column="1" colspan="2">
|
|
<widget class="QCheckBox" name="chbIgnoreExpiration">
|
|
<property name="text">
|
|
<string>Ignore Expiration</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="0" column="0">
|
|
<widget class="QLabel" name="lbxName">
|
|
<property name="text">
|
|
<string>Name:</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="5" column="0">
|
|
<widget class="QLabel" name="lbxExpiry">
|
|
<property name="text">
|
|
<string>Expiry:</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="3" column="0">
|
|
<widget class="QLabel" name="lbxCount">
|
|
<property name="font">
|
|
<font>
|
|
<pointsize>9</pointsize>
|
|
</font>
|
|
</property>
|
|
<property name="text">
|
|
<string>Count:</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="4" column="1" colspan="2">
|
|
<widget class="QCheckBox" name="chbIgnoreCount">
|
|
<property name="text">
|
|
<string>Ignore Count</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="5" column="1">
|
|
<widget class="QDateEdit" name="dateEdit">
|
|
<property name="calendarPopup">
|
|
<bool>true</bool>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item row="7" column="0" colspan="3">
|
|
<spacer name="verticalSpacer">
|
|
<property name="orientation">
|
|
<enum>Qt::Vertical</enum>
|
|
</property>
|
|
</spacer>
|
|
</item>
|
|
<item row="0" column="1" colspan="2">
|
|
<widget class="QLineEdit" name="leName"/>
|
|
</item>
|
|
</layout>
|
|
</widget>
|
|
<customwidgets>
|
|
<customwidget>
|
|
<class>NGLDialogButtonBox</class>
|
|
<extends>QWidget</extends>
|
|
<header>nglwidgets/ngldialogbuttonbox.h</header>
|
|
</customwidget>
|
|
<customwidget>
|
|
<class>NGLDialog</class>
|
|
<extends>QDialog</extends>
|
|
<header>nglwidgets/ngldialog.h</header>
|
|
<container>1</container>
|
|
</customwidget>
|
|
</customwidgets>
|
|
<tabstops>
|
|
<tabstop>leName</tabstop>
|
|
<tabstop>sbMaxCount</tabstop>
|
|
<tabstop>chbIgnoreCount</tabstop>
|
|
<tabstop>dateEdit</tabstop>
|
|
<tabstop>timeEdit</tabstop>
|
|
<tabstop>chbIgnoreExpiration</tabstop>
|
|
<tabstop>nglDialogButtonBox</tabstop>
|
|
</tabstops>
|
|
<resources/>
|
|
<connections/>
|
|
</ui>
|