disable-qstring-hash-code.patch 714 B

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