From aad8d17f74ebdc59d15aaeec475670cf9aee8fed Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Wed, 8 Apr 2020 13:35:16 +0200 Subject: QApplication: remove forwarding of QGuiApplication::windowIcon MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: If886b0187bd5a6e0d57f6f0ed6bc4fca3edbe435 Reviewed-by: Tor Arne Vestbø --- src/widgets/kernel/qapplication.cpp | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'src/widgets/kernel/qapplication.cpp') diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index 5dd24d1052..5276268f08 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -1479,24 +1479,6 @@ QString QApplicationPrivate::desktopStyleKey() return QString(); } -#if QT_VERSION < 0x060000 // remove these forwarders in Qt 6 -/*! - \property QApplication::windowIcon - \brief the default window icon - - \sa QWidget::setWindowIcon(), {Setting the Application Icon} -*/ -QIcon QApplication::windowIcon() -{ - return QGuiApplication::windowIcon(); -} - -void QApplication::setWindowIcon(const QIcon &icon) -{ - QGuiApplication::setWindowIcon(icon); -} -#endif - void QApplicationPrivate::notifyWindowIconChanged() { QEvent ev(QEvent::ApplicationWindowIconChange); -- cgit v1.2.3