From 7b40f1ed7ef7b03295c2210fecd318635b825430 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 30 Aug 2022 13:29:42 +0200 Subject: [PATCH] Debugger: Fix compilation with current Qt dev MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit data/dev/qt-6/qtbase/src/corelib/kernel/qmetatype.h: In instantiation of ‘constexpr bool QtPrivate::checkTypeIsSuitableForMetaType() [with X = Debugger::Internal::StartApplicationParameters]’: /data/dev/creator-out/src/plugins/debugger/debuggerdialogs.cpp:102:1: required from here /data/dev/qt-6/qtbase/src/corelib/kernel/qmetatype.h:1162:51: error: static assertion failed: Meta Types must be fully defined 1162 | static_assert(is_complete::value || std::is_void_v, | ~~~~~~^~~~~~~~~~~~~~~~~~~~ /data/dev/qt-6/qtbase/src/corelib/kernel/qmetatype.h:1162:51: note: ‘(((bool)std::integral_constant::value) || ((bool)std::is_void_v))’ evaluates to false Change-Id: Ibbb2c306b7a4c741e05a3e83a140e2053bfeabd0 Reviewed-by: Eike Ziller --- src/plugins/debugger/debuggerdialogs.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/plugins/debugger/debuggerdialogs.cpp b/src/plugins/debugger/debuggerdialogs.cpp index f65ddd91908..a75f34e354a 100644 --- a/src/plugins/debugger/debuggerdialogs.cpp +++ b/src/plugins/debugger/debuggerdialogs.cpp @@ -96,14 +96,6 @@ public: QDialogButtonBox *buttonBox; }; -} // namespace Internal -} // namespace Debugger - -Q_DECLARE_METATYPE(Debugger::Internal::StartApplicationParameters) - -namespace Debugger { -namespace Internal { - /////////////////////////////////////////////////////////////////////// // // StartApplicationParameters @@ -134,6 +126,14 @@ public: FilePath debugInfoLocation; }; +} // namespace Internal +} // namespace Debugger + +Q_DECLARE_METATYPE(Debugger::Internal::StartApplicationParameters) + +namespace Debugger { +namespace Internal { + bool StartApplicationParameters::equals(const StartApplicationParameters &rhs) const { return runnable.command == rhs.runnable.command