Skip to content

Commit 22cc41c

Browse files
committed
Don't export QThread classes from the bindings, they have issues in shiboken
1 parent efd3502 commit 22cc41c

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

ui/addressdialog.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,16 @@
66
#include <QtWidgets/QCheckBox>
77
#include <QtWidgets/QComboBox>
88
#include <QtCore/QTimer>
9+
#ifndef BINARYNINJAUI_BINDINGS
910
#include <QtCore/QThread>
11+
#endif
1012
#include "binaryninjaapi.h"
1113
#include "uitypes.h"
1214

15+
#ifdef BINARYNINJAUI_BINDINGS
16+
// QThread has issues working in the bindings on some platforms
17+
class GetSymbolsListThread;
18+
#else
1319
class BINARYNINJAUIAPI GetSymbolsListThread: public QThread
1420
{
1521
Q_OBJECT
@@ -29,6 +35,7 @@ class BINARYNINJAUIAPI GetSymbolsListThread: public QThread
2935

3036
const QStringList& getSymbols() const { return m_allSymbols; }
3137
};
38+
#endif
3239

3340

3441
class BINARYNINJAUIAPI AddressDialogWithPreview: public QDialog

ui/typedialog.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,17 @@
55
#include <QtCore/QStringListModel>
66
#include <QtWidgets/QComboBox>
77
#include <QtCore/QTimer>
8+
#ifndef BINARYNINJAUI_BINDINGS
89
#include <QtCore/QThread>
10+
#endif
911
#include "binaryninjaapi.h"
1012
#include "uitypes.h"
1113

1214

15+
#ifdef BINARYNINJAUI_BINDINGS
16+
// QThread has issues working in the bindings on some platforms
17+
class GetTypesListThread;
18+
#else
1319
class BINARYNINJAUIAPI GetTypesListThread: public QThread
1420
{
1521
Q_OBJECT
@@ -29,6 +35,7 @@ class BINARYNINJAUIAPI GetTypesListThread: public QThread
2935

3036
const QStringList& getTypes() const { return m_allTypes; }
3137
};
38+
#endif
3239

3340
class BINARYNINJAUIAPI TypeDialog: public QDialog
3441
{

0 commit comments

Comments
 (0)