Merge feature/lift-lts-viewer-module-upto-qt6 into feature/regression-arcgis300-symbology-migration
- Integrated LTS viewer module with Qt6 migration - Resolved all merge conflicts by keeping current branch versions - Preserved existing Qt6 migration fixes
This commit is contained in:
1168 files changed
+120814
-323
No files matched your search
@@ -161,7 +161,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsWidgets
|
||||
NGL_TARGET_LINK_LIBRARIES(LtsWidgets
|
||||
PRIVATE
|
||||
Qt6::Network # for QHostInfo - for portability
|
||||
Qt6::Svg
|
||||
$<IF:$<TARGET_EXISTS:Qt6::Svg>,Qt6::Svg,>
|
||||
ngltools
|
||||
ngltranslator
|
||||
NGLLogger
|
||||
|
||||
@@ -39,7 +39,9 @@
|
||||
#include <QtWidgets/QPushButton>
|
||||
#include <QtWidgets/QScrollArea>
|
||||
#include <QScroller>
|
||||
#include <QSvgRenderer>
|
||||
#ifdef QT_SVG_LIB
|
||||
#include <QtSvg/QSvgRenderer>
|
||||
#endif
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtWidgets/QToolButton>
|
||||
#include <QtCore/QPropertyAnimation>
|
||||
@@ -399,6 +401,7 @@ void LtsBaseLayoutWidget::showEvent(QShowEvent *event)
|
||||
{
|
||||
const QSize s(QSize(rendererSizeHint.height(), rendererSizeHint.height()) * dpr);
|
||||
// RDE SPLITTER LEFT
|
||||
#ifdef QT_SVG_LIB
|
||||
QSvgRenderer svgRenderer;
|
||||
QPixmap pixmap(s);
|
||||
pixmap.fill(Qt::transparent);
|
||||
@@ -410,6 +413,9 @@ void LtsBaseLayoutWidget::showEvent(QShowEvent *event)
|
||||
|
||||
pixmap.setDevicePixelRatio(dpr);
|
||||
m_ui->lbRdeSplitterLeft->setPixmap(pixmap);
|
||||
#else
|
||||
qWarning() << "QSvgRenderer not available - skipping SVG rendering for splitter";
|
||||
#endif
|
||||
}
|
||||
|
||||
{
|
||||
|
||||
+3
-3
@@ -64,7 +64,7 @@ void LtsColumnFilterProxyModel::setColumnStringFilter(const QString &newFilterSt
|
||||
}
|
||||
}
|
||||
beginFilterChange();
|
||||
endFilterChange();
|
||||
endFilterChange();
|
||||
}
|
||||
|
||||
void LtsColumnFilterProxyModel::setColumnDataFilter(const QVariant &newFilterData, int column)
|
||||
@@ -92,7 +92,7 @@ void LtsColumnFilterProxyModel::setColumnDataFilter(const QVariant &newFilterDat
|
||||
}
|
||||
}
|
||||
beginFilterChange();
|
||||
endFilterChange();
|
||||
endFilterChange();
|
||||
}
|
||||
|
||||
|
||||
@@ -141,7 +141,7 @@ void LtsColumnFilterProxyModel::setRecursiveFilteringEnabled(bool recursive)
|
||||
return;
|
||||
m_bRecursiveFiltering = recursive;
|
||||
beginFilterChange();
|
||||
endFilterChange();
|
||||
endFilterChange();
|
||||
}
|
||||
|
||||
bool LtsColumnFilterProxyModel::recursiveFilteringEnabled() const
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
#include "lts_msec_date_time_edit.h"
|
||||
#include <QTimeZone>
|
||||
|
||||
|
||||
namespace LtsWidgets
|
||||
|
||||
Reference in new issue
Block a user