drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 9 Activity

[nostalgia] Make portable between Qt5 and Qt6

Browse Source
This commit is contained in:
Gary Talent 2021-03-30 21:25:01 -05:00
parent 8d62aca8a7
commit 2b469da8c3
6 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/nostalgia/CMakeLists.txt
View File

@ -3,8 +3,8 @@
if(NOSTALGIA_BUILD_TYPE STREQUAL "Native")
if(NOSTALGIA_BUILD_STUDIO)
find_package(Qt6Widgets REQUIRED)
find_package(Qt6QuickWidgets REQUIRED)
find_package(QT NAMES Qt6 Qt5 COMPONENTS QuickWidgets Widgets REQUIRED)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS QuickWidgets Widgets REQUIRED)
endif()
endif()

4
src/nostalgia/core/studio/CMakeLists.txt
View File

@ -21,8 +21,8 @@ endif()
target_link_libraries(
NostalgiaCore-Studio
Qt6::Core
Qt6::QuickWidgets
Qt${QT_VERSION_MAJOR}::Core
Qt${QT_VERSION_MAJOR}::QuickWidgets
NostalgiaStudio
NostalgiaCore-Qt
NostalgiaCore

2
src/nostalgia/studio/CMakeLists.txt
View File

@ -53,7 +53,7 @@ add_executable(
target_link_libraries(
NostalgiaStudioJsonTest
OxStd
Qt6::Widgets
Qt${QT_VERSION_MAJOR}::Widgets
)
add_test("[nostalgia/studio] NostalgiaStudioJson" NostalgiaStudioJsonTest)

2
src/nostalgia/studio/lib/CMakeLists.txt
View File

@ -17,7 +17,7 @@ target_include_directories(NostalgiaStudio PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
target_link_libraries(
NostalgiaStudio PUBLIC
Qt6::Widgets
Qt${QT_VERSION_MAJOR}::Widgets
OxFS
OxClaw
)

2
src/nostalgia/studio/main.cpp
View File

@ -27,7 +27,9 @@ int main(int argc, char **args) {
qdark::load(&app);
}
// force QtQuick to use OpenGL (https://doc.qt.io/qt-6/quick-changes-qt6.html#changes-to-qquickwidget)
#if QT_VERSION >= 0x060000
QQuickWindow::setGraphicsApi(QSGRendererInterface::OpenGLRhi);
#endif
// open window
try {
MainWindow w(argProfilePath);

4
src/nostalgia/world/studio/CMakeLists.txt
View File

@ -9,8 +9,8 @@ add_library(
target_link_libraries(
NostalgiaWorld-Studio
Qt6::Core
Qt6::Widgets
Qt${QT_VERSION_MAJOR}::Core
Qt${QT_VERSION_MAJOR}::Widgets
NostalgiaStudio
)