mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-05 19:19:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update to newer Qt version (#3369)

Browse Source
This commit is contained in:
Alexander Bock
2024-08-10 23:26:46 +02:00
committed by GitHub
parent 845724b788
commit 414c050330
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/OpenSpace/CMakeLists.txt
View File

@@ -147,10 +147,9 @@ if (WIN32)
# Find the windeployqt application
get_target_property(_qmake_executable Qt6::qmake IMPORTED_LOCATION)
get_filename_component(_qt_bin_dir "${_qmake_executable}" DIRECTORY)
find_program(WINDEPLOYQT_EXECUTABLE windeployqt HINTS "${_qt_bin_dir}")
add_custom_command(
TARGET OpenSpace POST_BUILD
COMMAND "${CMAKE_COMMAND}" -E env PATH="${_qt_bin_dir}" "${WINDEPLOYQT_EXECUTABLE}" --verbose 0 --no-compiler-runtime --no-translations \"$<TARGET_FILE:OpenSpace>\"
COMMAND "${CMAKE_COMMAND}" -E env PATH="${_qt_bin_dir}" "${_qt_bin_dir}/windeployqt6.exe" --verbose 0 --no-compiler-runtime --no-translations \"$<TARGET_FILE:OpenSpace>\"
COMMENT "Deploying Qt libraries"
)
endif ()

2
apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
View File

@@ -224,7 +224,7 @@ LauncherWindow::LauncherWindow(bool profileEnabled,
qInstallMessageHandler(
[](QtMsgType type, const QMessageLogContext&, const QString& msg) {
if (type == QtCriticalMsg || type == QtFatalMsg || type == QtSystemMsg) {
if (type == QtCriticalMsg || type == QtFatalMsg || type == QtCriticalMsg) {
std::cerr << msg.toStdString() << '\n';
}
}

2
apps/OpenSpace/ext/launcher/src/profile/assettreeitem.cpp
View File

@@ -151,7 +151,7 @@ bool AssetTreeItem::insertColumns(int position, int columns) {
_itemData.insert(_itemData.begin() + position, QVariant());
}
for (AssetTreeItem* child : qAsConst(_childItems)) {
for (AssetTreeItem* child : _childItems) {
child->insertColumns(position, columns);
}