github_mirror
/
framelesshelper
mirror of https://github.com/wangwenx190/framelesshelper.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Fix Qt6 build. 

Signed-off-by: Yuhang Zhao <2546789017@qq.com>
This commit is contained in:
Yuhang Zhao 2020-11-06 10:31:19 +08:00
parent d3152df01f
commit fd3fb7deda
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
CMakeLists.txt
View File

@ -18,8 +18,9 @@ else()
set(CMAKE_DEBUG_POSTFIX _debug) set(CMAKE_DEBUG_POSTFIX _debug)
endif() endif()
find_package(Qt5 COMPONENTS Gui REQUIRED) find_package(QT NAMES Qt6 Qt5 COMPONENTS Gui REQUIRED)
find_package(Qt5 COMPONENTS Widgets Quick) find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Gui REQUIRED)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets Quick)
set(SOURCES set(SOURCES
framelesshelper_global.h framelesshelper_global.h
@ -27,7 +28,7 @@ set(SOURCES
framelesswindowsmanager.cpp framelesswindowsmanager.cpp
) )
if(Qt5Quick_FOUND) if(TARGET Qt${QT_VERSION_MAJOR}::Quick)
list(APPEND SOURCES list(APPEND SOURCES
framelessquickhelper.h framelessquickhelper.h
framelessquickhelper.cpp framelessquickhelper.cpp
@ -80,12 +81,18 @@ if(WIN32)
user32 shell32 gdi32 dwmapi shcore uxtheme d2d1 user32 shell32 gdi32 dwmapi shcore uxtheme d2d1
) )
endif() endif()
target_link_libraries(${PROJECT_NAME} PRIVATE Qt::GuiPrivate) target_link_libraries(${PROJECT_NAME} PRIVATE
if(Qt5Widgets_FOUND) Qt${QT_VERSION_MAJOR}::GuiPrivate
target_link_libraries(${PROJECT_NAME} PRIVATE Qt::Widgets) )
if(TARGET Qt${QT_VERSION_MAJOR}::Widgets)
target_link_libraries(${PROJECT_NAME} PRIVATE
Qt${QT_VERSION_MAJOR}::Widgets
)
endif() endif()
if(Qt5Quick_FOUND) if(TARGET Qt${QT_VERSION_MAJOR}::Quick)
target_link_libraries(${PROJECT_NAME} PRIVATE Qt::Quick) target_link_libraries(${PROJECT_NAME} PRIVATE
Qt${QT_VERSION_MAJOR}::Quick
)
endif() endif()
target_include_directories(${PROJECT_NAME} PUBLIC target_include_directories(${PROJECT_NAME} PUBLIC
"$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>" "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>"

7
winnativeeventfilter.cpp
View File

@ -1833,7 +1833,7 @@ bool WinNativeEventFilter::nativeEventFilter(const QByteArray &eventType,
#ifdef QT_WIDGETS_LIB #ifdef QT_WIDGETS_LIB
const auto widget = qobject_cast<QWidget *>(object); const auto widget = qobject_cast<QWidget *>(object);
if (widget) { if (widget) {
const QPoint pos = widget->mapToGlobal({0, 0}); const QPointF pos = widget->mapToGlobal(QPointF{0, 0});
if (QRectF(pos.x() * dpr, if (QRectF(pos.x() * dpr,
pos.y() * dpr, pos.y() * dpr,
widget->width() * dpr, widget->width() * dpr,
@ -1846,7 +1846,7 @@ bool WinNativeEventFilter::nativeEventFilter(const QByteArray &eventType,
#ifdef QT_QUICK_LIB #ifdef QT_QUICK_LIB
const auto quickItem = qobject_cast<QQuickItem *>(object); const auto quickItem = qobject_cast<QQuickItem *>(object);
if (quickItem) { if (quickItem) {
const QPointF pos = quickItem->mapToGlobal({0, 0}); const QPointF pos = quickItem->mapToGlobal(QPointF{0, 0});
if (QRectF(pos.x() * dpr, if (QRectF(pos.x() * dpr,
pos.y() * dpr, pos.y() * dpr,
quickItem->width() * dpr, quickItem->width() * dpr,
@ -2557,7 +2557,8 @@ bool WinNativeEventFilter::lightThemeEnabled()
bool WinNativeEventFilter::darkThemeEnabled() bool WinNativeEventFilter::darkThemeEnabled()
{ {
return coreData()->m_lpShouldAppsUseDarkMode ? coreData()->m_lpShouldAppsUseDarkMode() : false; return coreData()->m_lpShouldSystemUseDarkMode ? coreData()->m_lpShouldSystemUseDarkMode()
: false;
} }
bool WinNativeEventFilter::highContrastModeEnabled() bool WinNativeEventFilter::highContrastModeEnabled()