Utils: Collapse most of porting,h

Taking the Qt 6 branches, leaving some dummies until downstream
adapted.

Change-Id: Ib9b86568d73c341c8f740ba497c3cbfab830d8a1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
hjk
2022-07-13 09:27:18 +02:00
parent 480da99508
commit 802de0eb5e
82 changed files with 206 additions and 256 deletions

View File

@@ -74,7 +74,7 @@ public:
DockWidget(QWidget *inner, FancyMainWindow *parent, bool immutable = false);
bool eventFilter(QObject *, QEvent *event) override;
void enterEvent(EnterEvent *event) override;
void enterEvent(QEnterEvent *event) override;
void leaveEvent(QEvent *event) override;
void handleMouseTimeout();
void handleToplevelChanged(bool floating);
@@ -114,7 +114,7 @@ public:
QSize minimumSizeHint() const override { return sizeHint(); }
void enterEvent(EnterEvent *event) override
void enterEvent(QEnterEvent *event) override
{
if (isEnabled())
update();
@@ -193,7 +193,7 @@ public:
setProperty("managed_titlebar", 1);
}
void enterEvent(EnterEvent *event) override
void enterEvent(QEnterEvent *event) override
{
setActive(true);
QWidget::enterEvent(event);
@@ -303,7 +303,7 @@ bool DockWidget::eventFilter(QObject *, QEvent *event)
return false;
}
void DockWidget::enterEvent(EnterEvent *event)
void DockWidget::enterEvent(QEnterEvent *event)
{
if (!m_immutable)
QApplication::instance()->installEventFilter(this);