Qt6 migration: LtsWidgets API fixes, LtsWebSocket logger init, RTI Docker install
- LtsWidgets: Fixed Qt6 API compatibility issues - QWheelEvent::delta() → angleDelta().y() - QStyleOption::init() → initFrom() - QComboBox activated signal signature change - QTextCodec removal (UTF-8 default in Qt6) - Missing widget includes added - LtsWebSocket: Fixed m_logger reference initialization - Added NGLLoggerBootstrap includes - Proper initialization in constructor initializer lists - CMake: Added BUILD_LTSWEBSOCKET option for temporary exclusion - Docker: RTI Connext permanent installation script added - ci/install-rti-in-docker.sh for persistent RTI setup - Removes need for volume mounting RTI into container - BUILD options: FilterManagement, RTI, Codification, Grantlee, LtsWebSocket can be disabled for partial builds during migration Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
69 files changed
+12765
-14202
No files matched your search
Executable → Regular
+34
-38
@@ -1,60 +1,56 @@
|
||||
|
||||
|
||||
|
||||
#pragma once
|
||||
#include <QObject>
|
||||
|
||||
#include "ltswidgets_export.h"
|
||||
|
||||
#include <QComboBox>
|
||||
|
||||
#include <QObject>
|
||||
|
||||
namespace LtsWidgets
|
||||
{
|
||||
|
||||
|
||||
|
||||
class LTSWIDGETS_EXPORT LtsComboBox : public QComboBox
|
||||
class LTSWIDGETS_EXPORT LtsComboBox : public QComboBox
|
||||
{
|
||||
Q_OBJECT
|
||||
using BaseClass = QComboBox;
|
||||
Q_OBJECT
|
||||
using BaseClass = QComboBox;
|
||||
|
||||
public:
|
||||
explicit LtsComboBox(QWidget *parent = nullptr);
|
||||
~LtsComboBox() = default;
|
||||
public:
|
||||
explicit LtsComboBox(QWidget* parent = nullptr);
|
||||
~LtsComboBox() = default;
|
||||
|
||||
|
||||
static void setUseSelectionDialog(bool bUseSelectionDialog);
|
||||
|
||||
static void setUseSelectionDialog(bool bUseSelectionDialog);
|
||||
bool hasValueChanged() const;
|
||||
|
||||
|
||||
void setExternalContentType(int ect)
|
||||
{
|
||||
m_externalContentType = ect;
|
||||
}
|
||||
|
||||
bool hasValueChanged() const;
|
||||
int externalContentType() const
|
||||
{
|
||||
return m_externalContentType;
|
||||
}
|
||||
|
||||
void setExternalContentType(int ect) { m_externalContentType = ect; }
|
||||
int externalContentType() const { return m_externalContentType; }
|
||||
protected:
|
||||
void showPopup() override;
|
||||
|
||||
protected:
|
||||
|
||||
void showEvent(QShowEvent* e) override;
|
||||
void enterEvent(QEnterEvent* e) override;
|
||||
void leaveEvent(QEvent*) override;
|
||||
|
||||
void showPopup() override;
|
||||
protected slots:
|
||||
void userChangedIndex(int index);
|
||||
|
||||
void showEvent(QShowEvent *e) override;
|
||||
void enterEvent(QEvent *e) override;
|
||||
void leaveEvent(QEvent *) override;
|
||||
signals:
|
||||
void signalExternallyChanged();
|
||||
void signalRefill();
|
||||
void signalEnterEvent();
|
||||
void signalLeaveEvent();
|
||||
|
||||
protected slots:
|
||||
void userChangedIndex(int index);
|
||||
|
||||
signals:
|
||||
void signalExternallyChanged();
|
||||
void signalRefill();
|
||||
void signalEnterEvent();
|
||||
void signalLeaveEvent();
|
||||
|
||||
private:
|
||||
int m_currentIndex;
|
||||
int m_externalContentType;
|
||||
static bool s_useSelectionDialog;
|
||||
private:
|
||||
int m_currentIndex;
|
||||
int m_externalContentType;
|
||||
static bool s_useSelectionDialog;
|
||||
};
|
||||
}
|
||||
} // namespace LtsWidgets
|
||||
Reference in new issue
Block a user