1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QApplication: remove forwarding of QGuiApplication::windowIcon

Browse Source 
Change-Id: If886b0187bd5a6e0d57f6f0ed6bc4fca3edbe435
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Volker Hilsheimer 2020-04-08 13:35:16 +02:00
parent d638d62ce3
commit aad8d17f74
2 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/widgets/kernel/qapplication.cpp
View File

@ -1479,24 +1479,6 @@ QString QApplicationPrivate::desktopStyleKey()
return QString(); 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() void QApplicationPrivate::notifyWindowIconChanged()
{ {
QEvent ev(QEvent::ApplicationWindowIconChange); QEvent ev(QEvent::ApplicationWindowIconChange);

6
src/widgets/kernel/qapplication.h
View File

@ -71,7 +71,6 @@ class QApplicationPrivate;
class Q_WIDGETS_EXPORT QApplication : public QGuiApplication class Q_WIDGETS_EXPORT QApplication : public QGuiApplication
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(QIcon windowIcon READ windowIcon WRITE setWindowIcon)
Q_PROPERTY(int cursorFlashTime READ cursorFlashTime WRITE setCursorFlashTime) Q_PROPERTY(int cursorFlashTime READ cursorFlashTime WRITE setCursorFlashTime)
Q_PROPERTY(int doubleClickInterval READ doubleClickInterval WRITE setDoubleClickInterval) Q_PROPERTY(int doubleClickInterval READ doubleClickInterval WRITE setDoubleClickInterval)
Q_PROPERTY(int keyboardInputInterval READ keyboardInputInterval WRITE setKeyboardInputInterval) Q_PROPERTY(int keyboardInputInterval READ keyboardInputInterval WRITE setKeyboardInputInterval)
@ -110,11 +109,6 @@ public:
static void setFont(const QFont &, const char* className = nullptr); static void setFont(const QFont &, const char* className = nullptr);
static QFontMetrics fontMetrics(); static QFontMetrics fontMetrics();
#if QT_VERSION < 0x060000 // remove these forwarders in Qt 6
static void setWindowIcon(const QIcon &icon);
static QIcon windowIcon();
#endif
static QWidgetList allWidgets(); static QWidgetList allWidgets();
static QWidgetList topLevelWidgets(); static QWidgetList topLevelWidgets();