From 64eb0dea0337ed379b7d52695bb2a2a5d20bd31c Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Wed, 6 Apr 2016 17:11:27 +0000 Subject: [PATCH] Ensure enum types used a signal arguments are registered with Qt fully qualified git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6586 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- MetaDataRegistry.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/MetaDataRegistry.cpp b/MetaDataRegistry.cpp index 49a56a680..07ce46d32 100644 --- a/MetaDataRegistry.cpp +++ b/MetaDataRegistry.cpp @@ -23,6 +23,10 @@ QItemEditorFactory * item_editor_factory () void register_types () { + // we still have to register the fully qualified names of enum types + // used as signal/slot connection arguments since the new Qt 5.5 + // Q_ENUM macro only seems to register the unqualified name + // Radio namespace auto frequency_type_id = qRegisterMetaType ("Frequency"); qRegisterMetaType ("Frequencies"); @@ -61,9 +65,7 @@ void register_types () // Transceiver qRegisterMetaType ("Transceiver::TransceiverState"); -#if QT_VERSION < 0x050500 qRegisterMetaType ("Transceiver::MODE"); -#endif // Transceiver factory #if QT_VERSION < 0x050500