From c76dde4533af9acf9183241c3f90a6992e0213a4 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 12 Dec 2021 23:00:42 +0100 Subject: [PATCH] Fixed Windows Qt binding for Qt6 --- scripts/mkqtdecl6/mkqtdecl.conf | 8 -------- src/gsiqt/qt6/QtCore/gsiDeclQAbstractEventDispatcher.cc | 4 ---- 2 files changed, 12 deletions(-) diff --git a/scripts/mkqtdecl6/mkqtdecl.conf b/scripts/mkqtdecl6/mkqtdecl.conf index 93dfe634b..87a2d6160 100644 --- a/scripts/mkqtdecl6/mkqtdecl.conf +++ b/scripts/mkqtdecl6/mkqtdecl.conf @@ -504,14 +504,6 @@ add_native_impl_QRegion # alternative implementation for QPersistentQModelIndex::operator const QModelIndex & add_native_impl_QPersistentQModelIndex -# satisfy abstract methods for WIN32 -add_native_impl("QAbstractEventDispatcher_Adaptor", <<'CODE', nil) -#if defined(_WIN32) - virtual bool registerEventNotifier(QWinEventNotifier *) { return false; } - virtual void unregisterEventNotifier(QWinEventNotifier *) { } -#endif -CODE - # implementation of operator<< and operator>> for QDataStream add_native_impl_streams diff --git a/src/gsiqt/qt6/QtCore/gsiDeclQAbstractEventDispatcher.cc b/src/gsiqt/qt6/QtCore/gsiDeclQAbstractEventDispatcher.cc index 1c76a264c..e6e792539 100644 --- a/src/gsiqt/qt6/QtCore/gsiDeclQAbstractEventDispatcher.cc +++ b/src/gsiqt/qt6/QtCore/gsiDeclQAbstractEventDispatcher.cc @@ -463,10 +463,6 @@ GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QAbstractEventDis class QAbstractEventDispatcher_Adaptor : public QAbstractEventDispatcher, public qt_gsi::QtObjectBase { public: -#if defined(_WIN32) - virtual bool registerEventNotifier(QWinEventNotifier *) { return false; } - virtual void unregisterEventNotifier(QWinEventNotifier *) { } -#endif virtual ~QAbstractEventDispatcher_Adaptor();