From 22cc41cec5adbe95d04c79fcda40a86f0a79c5fc Mon Sep 17 00:00:00 2001 From: Rusty Wagner Date: Mon, 23 Nov 2020 23:16:47 -0500 Subject: Don't export QThread classes from the bindings, they have issues in shiboken --- ui/addressdialog.h | 7 +++++++ ui/typedialog.h | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/ui/addressdialog.h b/ui/addressdialog.h index 212b7a7a..0d8991b5 100644 --- a/ui/addressdialog.h +++ b/ui/addressdialog.h @@ -6,10 +6,16 @@ #include #include #include +#ifndef BINARYNINJAUI_BINDINGS #include +#endif #include "binaryninjaapi.h" #include "uitypes.h" +#ifdef BINARYNINJAUI_BINDINGS +// QThread has issues working in the bindings on some platforms +class GetSymbolsListThread; +#else class BINARYNINJAUIAPI GetSymbolsListThread: public QThread { Q_OBJECT @@ -29,6 +35,7 @@ public: const QStringList& getSymbols() const { return m_allSymbols; } }; +#endif class BINARYNINJAUIAPI AddressDialogWithPreview: public QDialog diff --git a/ui/typedialog.h b/ui/typedialog.h index 00a722bc..afd95ee9 100644 --- a/ui/typedialog.h +++ b/ui/typedialog.h @@ -5,11 +5,17 @@ #include #include #include +#ifndef BINARYNINJAUI_BINDINGS #include +#endif #include "binaryninjaapi.h" #include "uitypes.h" +#ifdef BINARYNINJAUI_BINDINGS +// QThread has issues working in the bindings on some platforms +class GetTypesListThread; +#else class BINARYNINJAUIAPI GetTypesListThread: public QThread { Q_OBJECT @@ -29,6 +35,7 @@ public: const QStringList& getTypes() const { return m_allTypes; } }; +#endif class BINARYNINJAUIAPI TypeDialog: public QDialog { -- cgit v1.3.1