diff --git a/qt6-after/qt6-migrated-legatus/Lts/Application/OpApp/main.cpp b/qt6-after/qt6-migrated-legatus/Lts/Application/OpApp/main.cpp index 99c070c49..b83bea9c9 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Application/OpApp/main.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Application/OpApp/main.cpp @@ -192,7 +192,7 @@ int main(int argc, char **argv) // TODO: json strings to lower NGLApplication app(argc, argv); app.createLogger("opApp"); QApplication::setQuitOnLastWindowClosed(false); // we are cool enough to handle it ourselves 8) - QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); + // Qt::AA_UseHighDpiPixmaps: no-op since Qt6 (high-DPI pixmaps are always enabled) QNetworkProxy::setApplicationProxy(QNetworkProxy()); // do NOT use proxies anywhere! NGL::LoggerHandler *lh = NGL::LoggerHandler::getLoggerHandler(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Application/THP/SitMapReplayTest/srp_main.cpp b/qt6-after/qt6-migrated-legatus/Lts/Application/THP/SitMapReplayTest/srp_main.cpp index 34268f7a8..900faea12 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Application/THP/SitMapReplayTest/srp_main.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Application/THP/SitMapReplayTest/srp_main.cpp @@ -23,7 +23,7 @@ int main(int argc, char **argv) QNetworkProxy::setApplicationProxy(QNetworkProxy()); NGLApplication app(argc, argv); app.createLogger("SRP"); - app.setAttribute(Qt::AA_UseHighDpiPixmaps); + // Qt::AA_UseHighDpiPixmaps: no-op since Qt6 (high-DPI pixmaps are always enabled) SituationReplay::ConnectionParams connParams; connParams.domainId = 1; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Application/THP/main.cpp b/qt6-after/qt6-migrated-legatus/Lts/Application/THP/main.cpp index 50cb9cfe9..4724e9e55 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Application/THP/main.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Application/THP/main.cpp @@ -50,7 +50,7 @@ int main(int argc, char **argv) app.createLogger("THP", "log4cxx_thp_viewer.props"); app.setOrganizationName(QStringLiteral("RME")); app.setApplicationName(QStringLiteral("thp_viewer")); - app.setAttribute(Qt::AA_UseHighDpiPixmaps); + // Qt::AA_UseHighDpiPixmaps: no-op since Qt6 (high-DPI pixmaps are always enabled) QDir::setSearchPaths(QLatin1String("icon"), QStringList(QLatin1String(":/style/"))); Q_INIT_RESOURCE(rme_light_style); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/visitors.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/visitors.cpp index ed9cc8db5..80105c241 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/visitors.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/visitors.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include namespace VCtrl @@ -87,10 +87,10 @@ void SplitVisitor::apply(osg::Group &node) for (unsigned int i = 0; i < node.getNumDescriptions(); ++i) { QString descr = QString::fromStdString(node.getDescription(i)); - const QVector descprt = descr.splitRef(QLatin1Char(';')); - for (const QStringRef &prt : descprt) + const QVector descprt = QStringView(descr).split(QLatin1Char(';')); + for (const QStringView &prt : descprt) { - const QVector items = prt.split(QLatin1Char('=')); + const QVector items = prt.split(QLatin1Char('=')); if (items.size() == 2 && items[0] == QLatin1String("base_height")) h = items[1].toFloat(); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Common/typestruct.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Common/typestruct.cpp index 4a0c9fa2e..c467fedc2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Common/typestruct.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Common/typestruct.cpp @@ -23,7 +23,7 @@ TypeStruct::TypeStruct(const rpr2::EntityTypeStruct &eis) TypeStruct TypeStruct::fromString(const QString &string) { - const QVector sl = string.splitRef(QLatin1Char('.')); + const QVector sl = QStringView(string).split(QLatin1Char('.')); TypeStruct ts; bool bOk;