mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2026-07-12 22:04:17 -04:00
Merging from trunk:
------------------------------------------------------------------------ r7867 | bsomervi | 2017-07-13 19:02:07 +0100 (Thu, 13 Jul 2017) | 5 lines Fixes the issue with the IARU Region setting not being saved and restored correctly Use proper QDataStream insertor and extractor for IARURegions::Region enum. Unfortunately this requires that all will have to reset their region one more time even if it was working and correct. ------------------------------------------------------------------------ git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx-1.8@7868 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
@@ -12,6 +12,7 @@
|
||||
#include "Transceiver.hpp"
|
||||
#include "TransceiverFactory.hpp"
|
||||
#include "WFPalette.hpp"
|
||||
#include "IARURegions.hpp"
|
||||
|
||||
#include "FrequencyLineEdit.hpp"
|
||||
|
||||
@@ -79,4 +80,10 @@ void register_types ()
|
||||
|
||||
// Waterfall palette
|
||||
qRegisterMetaTypeStreamOperators<WFPalette::Colours> ("Colours");
|
||||
|
||||
// IARURegions
|
||||
#if QT_VERSION < 0x050500
|
||||
qRegisterMetaType<IARURegions::Region> ("IARURegions::Region");
|
||||
#endif
|
||||
qRegisterMetaTypeStreamOperators<IARURegions::Region> ("IARURegions::Region");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user