Skip to content

Migrate to use QT6 (still supports QT5 5.15+) #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Migrate to use QT6 (still supports QT5 5.15+) #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions gui/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,20 @@ include_directories (
# Run Qt's moc automatically.
set (CMAKE_AUTOMOC ON)

find_package (Qt5Widgets)
find_package(Qt6 COMPONENTS Core Widgets)
if (NOT Qt6_FOUND)
find_package(Qt5 5.15 REQUIRED COMPONENTS Core Widgets)
endif()

configure_file (gui_info.rc.in gui_info.rc)

if (POLOLU_BUILD)
if (APPLE)
# Embed app.icns in the executable.
qt5_add_resources(ICON_QRC qt/app_icns.qrc)
qt_add_resources(ICON_QRC qt/app_icns.qrc)
else ()
# Embed app.ico in the executable.
qt5_add_resources(ICON_QRC qt/app_ico.qrc)
qt_add_resources(ICON_QRC qt/app_ico.qrc)
endif ()
endif ()

Expand Down Expand Up @@ -50,6 +53,6 @@ if (WIN32)
)
endif ()

target_link_libraries (gui Qt5::Widgets lib bootloader)
target_link_libraries (gui Qt::Widgets lib bootloader)

install(TARGETS gui DESTINATION bin)
3 changes: 1 addition & 2 deletions gui/qt/main_window.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
#include <QCloseEvent>
#include <QComboBox>
#include <QDesktopServices>
#include <QDesktopWidget>
#include <QDoubleSpinBox>
#include <QFileDialog>
#include <QGridLayout>
Expand Down Expand Up @@ -1365,7 +1364,7 @@ void main_window::center_at_startup_if_needed()
Qt::LeftToRight,
Qt::AlignCenter,
size(),
qApp->desktop()->availableGeometry()
qApp->primaryScreen()->availableGeometry()
)
);
}
Expand Down