diff --git a/.reuse/dep5 b/.reuse/dep5 index b71aea14..5162d4e4 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -86,4 +86,4 @@ License: LGPL-2.1-only or GPL-3.0-only # qt-oldfile-2 Files: xcb/libqt5xcbqpa-dev/5.1*.*/* xcb/libqt6xcbqpa-dev/6.*.*/* Copyright: The Qt Company Ltd. -License: LGPL-3.0-only or GPL-2.0-only or GPL-3.0-or-later +License: LicenseRef-Qt-Commercial or LGPL-3.0-only or GPL-2.0-only or GPL-3.0-or-later diff --git a/CMakeLists.txt b/CMakeLists.txt index 51626bc1..86b8728b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,7 +39,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) -set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(REQUIRED_QT_VERSION 5.15.0) if (CMAKE_BUILD_TYPE STREQUAL "Debug") diff --git a/LICENSES/LicenseRef-Qt-Commercial.txt b/LICENSES/LicenseRef-Qt-Commercial.txt new file mode 100644 index 00000000..825b1f35 --- /dev/null +++ b/LICENSES/LicenseRef-Qt-Commercial.txt @@ -0,0 +1,8 @@ +Licensees holding valid commercial Qt licenses may use this software in +accordance with the the terms contained in a written agreement between +you and The Qt Company. Alternatively, the terms and conditions that were +accepted by the licensee when buying and/or downloading the +software do apply. + +For the latest licensing terms and conditions, see https://www.qt.io/terms-conditions. +For further information use the contact form at https://www.qt.io/contact-us. diff --git a/src/dbackingstoreproxy.cpp b/src/dbackingstoreproxy.cpp index 62b2b3da..c2b56453 100644 --- a/src/dbackingstoreproxy.cpp +++ b/src/dbackingstoreproxy.cpp @@ -14,7 +14,17 @@ #include #include +#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) +#if __has_include("utility.h") +#define __D_HAS_UTILITY__ +#endif +#else #if QT_HAS_INCLUDE("utility.h") +#define __D_HAS_UTILITY__ +#endif +#endif + +#ifdef __D_HAS_UTILITY__ #include "utility.h" #include "dwmsupport.h" #else diff --git a/src/dnativesettings.cpp b/src/dnativesettings.cpp index a6f33c57..f5b0bc20 100644 --- a/src/dnativesettings.cpp +++ b/src/dnativesettings.cpp @@ -6,7 +6,17 @@ #ifdef Q_OS_LINUX #include "dxcbxsettings.h" #endif +#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) +#if __has_include("dplatformintegration.h") +#define __D_HAS_DPLATFORMINTEGRATION__ +#endif +#else #if QT_HAS_INCLUDE("dplatformintegration.h") +#define __D_HAS_DPLATFORMINTEGRATION__ +#endif +#endif + +#ifdef __D_HAS_DPLATFORMINTEGRATION__ #include "dplatformintegration.h" #define IN_DXCB_PLUGIN #endif diff --git a/src/dxcbxsettings.cpp b/src/dxcbxsettings.cpp index f39511e3..4e42682d 100644 --- a/src/dxcbxsettings.cpp +++ b/src/dxcbxsettings.cpp @@ -5,7 +5,17 @@ #include "dxcbxsettings.h" +#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) +#if __has_include("dplatformintegration.h") +#define __D_HAS_DPLATFORMINTEGRATION__ +#endif +#else #if QT_HAS_INCLUDE("dplatformintegration.h") +#define __D_HAS_DPLATFORMINTEGRATION__ +#endif +#endif + +#ifdef __D_HAS_DPLATFORMINTEGRATION__ #include "dplatformintegration.h" #include "qxcbconnection.h" #define IN_DXCB_PLUGIN diff --git a/xcb/dforeignplatformwindow.h b/xcb/dforeignplatformwindow.h index 6555a6b1..b32ea0a7 100644 --- a/xcb/dforeignplatformwindow.h +++ b/xcb/dforeignplatformwindow.h @@ -10,6 +10,9 @@ #include #ifdef Q_OS_LINUX +#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) +#include +#endif #define private public #include "qxcbwindow.h" typedef QXcbWindow QNativeWindow; diff --git a/xcb/dplatformintegration.cpp b/xcb/dplatformintegration.cpp index 20b6b243..c58594d5 100644 --- a/xcb/dplatformintegration.cpp +++ b/xcb/dplatformintegration.cpp @@ -839,7 +839,11 @@ static xcb_cursor_t overrideCreateFontCursor(QXcbCursor *xcb_cursor, QCursor *c, // special case for non-standard dnd-* cursors cursor = loadCursor(dpy, cshape); +#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) + if (!cursor && !xcb_cursor->m_callbackForPropertyRegistered) { +#else if (!cursor && !xcb_cursor->m_gtkCursorThemeInitialized) { +#endif VtableHook::callOriginalFun(xcb_cursor, &QPlatformCursor::changeCursor, c, window); if (updateCursorTheme(dpy)) { diff --git a/xcb/dplatformwindowhelper.h b/xcb/dplatformwindowhelper.h index e3c95c78..ace4692c 100644 --- a/xcb/dplatformwindowhelper.h +++ b/xcb/dplatformwindowhelper.h @@ -8,6 +8,9 @@ #include #ifdef Q_OS_LINUX +#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) +#include +#endif #define private public #include "qxcbwindow.h" #include "qxcbclipboard.h"