Merge branch '1.1' into master

This commit is contained in:
Sergio Martins
2020-10-14 14:59:44 +01:00
10 changed files with 37 additions and 5 deletions

View File

@@ -29,7 +29,8 @@ class EventFilter : public QObject
{
public:
EventFilter(QEvent::Type type) : m_type(type) {}
bool eventFilter(QObject *, QEvent *e)
~EventFilter() override;
bool eventFilter(QObject *, QEvent *e) override
{
if (e->type() == m_type)
m_got = true;
@@ -41,6 +42,8 @@ public:
bool m_got = false;
};
EventFilter::~EventFilter() = default;
static bool isGammaray()
{
static bool is = qtHookData[3] != 0;
@@ -142,3 +145,5 @@ void Testing::setWarningObserver(WarningObserver *observer)
{
s_warningObserver = observer;
}
WarningObserver::~WarningObserver() = default;