1234567891011121314151617181920212223 |
- --- wsjtx.orig/qt_helpers.hpp 2019-11-26 14:22:32.000000000 +0000
- +++ wsjtx.fix/qt_helpers.hpp 2020-02-20 16:22:25.250018659 +0000
- @@ -78,6 +78,11 @@ public:
- }
- };
-
- +// XXX: Qt 5.14 has its own struct for QString, which creates a conflict
- +// with WSJT-X's definition. Currently, the only workaround is disabling
- +// WSJT-X's optimized code. It degrades performance on 64-bit platforms
- +// but for now, it's the only way to make it usable.
- +#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
- namespace std
- {
- // std::hash<> specialization for QString based on the dbj2
- @@ -97,6 +102,7 @@ namespace std
- }
- };
- }
- +#endif
-
- // Register some useful Qt types with QMetaType
- Q_DECLARE_METATYPE (QHostAddress);
|