From d54d28858f4072fc8ebb935e81bec80537f0ad44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Thu, 16 Nov 2023 12:56:12 +0100 Subject: [PATCH] Fix build with qt-namespace MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add missing include of global module header. Drop unneeded global namespace qualifier for constant in our namespace. Amends 6017695bfa98d8d9a6e5977ec80aafa1a4d3ee4d Change-Id: I04633030af13df3c3359fc09b08b4a5f031013a9 Reviewed-by: Tor Arne Vestbø --- src/gui/platform/windows/qwindowsthemecache.cpp | 2 +- src/gui/platform/windows/qwindowsthemecache_p.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gui/platform/windows/qwindowsthemecache.cpp b/src/gui/platform/windows/qwindowsthemecache.cpp index 3cf72f4757..3bb92e67ca 100644 --- a/src/gui/platform/windows/qwindowsthemecache.cpp +++ b/src/gui/platform/windows/qwindowsthemecache.cpp @@ -22,7 +22,7 @@ Q_GLOBAL_STATIC(ThemesCache, themesCache); QString QWindowsThemeCache::themeName(int theme) { return theme >= 0 && theme < int(std::size(themeNames)) - ? QString::fromWCharArray(::themeNames[theme]) : QString(); + ? QString::fromWCharArray(themeNames[theme]) : QString(); } HTHEME QWindowsThemeCache::createTheme(int theme, HWND hwnd) diff --git a/src/gui/platform/windows/qwindowsthemecache_p.h b/src/gui/platform/windows/qwindowsthemecache_p.h index bc065d47f3..beb724dc5c 100644 --- a/src/gui/platform/windows/qwindowsthemecache_p.h +++ b/src/gui/platform/windows/qwindowsthemecache_p.h @@ -15,6 +15,8 @@ // We mean it. // +#include "QtGui/private/qtguiglobal_p.h" + #include #include