Skip to content

fix: compatibility with Qt 6.10 #376

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
felixonmars wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: compatibility with Qt 6.10 #376

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
3 changes: 3 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,9 @@ find_package(Qt${QT_MAJOR_VERSION} REQUIRED COMPONENTS
Widgets
LinguistTools
)
if(Qt${QT_MAJOR_VERSION}_VERSION VERSION_GREATER_EQUAL 6.10)
find_package(Qt${QT_MAJOR_VERSION} COMPONENTS CorePrivate GuiPrivate REQUIRED)
endif()

if (QT_MAJOR_VERSION EQUAL "5")
find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS X11Extras)
Expand Down
4 changes: 4 additions & 0 deletions src/plugins/qpa/integration.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,14 @@
#include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h>
#include <QtThemeSupport/private/qgenericunixthemes_p.h>
#else
#include <QtGui/private/qgenericunixeventdispatcher_p.h>

Check warning on line 36 in src/plugins/qpa/integration.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <QtGui/private/qgenericunixeventdispatcher_p.h> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <QtGui/private/qgenericunixfontdatabase_p.h>

Check warning on line 37 in src/plugins/qpa/integration.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <QtGui/private/qgenericunixfontdatabase_p.h> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#if QT_VERSION < QT_VERSION_CHECK(6, 10, 0)
#include <QtGui/private/qgenericunixthemes_p.h>
#else
#include <QtGui/private/qgenericunixtheme_p.h>

Check warning on line 41 in src/plugins/qpa/integration.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <QtGui/private/qgenericunixtheme_p.h> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#endif
#include <QtGui/private/qunixeventdispatcher_qpa_p.h>

Check warning on line 43 in src/plugins/qpa/integration.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <QtGui/private/qunixeventdispatcher_qpa_p.h> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#endif

namespace KWin
Expand Down