diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-06-08 21:16:10 +0200 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-06-08 23:37:07 +0200 |
commit | bb4402af2b2233100f9ca4a853af34b46cc60ffd (patch) | |
tree | d37348884c08e374f5b920f41dd198d4566b1b0a /src/gui | |
parent | 2a864a4f8568b9fe4a56c02926ed5d873bc774b7 (diff) |
Add deprecation warnings to QGuiApplication::fontChanged/paletteChanged
And silence those warnings in code that emits those signals.
Change-Id: Ic9013648060c9b84b59c44bb5a8c77e48f82d24f
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 6 | ||||
-rw-r--r-- | src/gui/kernel/qguiapplication.h | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index a1e5da4a32..c6d6a97547 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -3363,7 +3363,10 @@ void QGuiApplicationPrivate::handlePaletteChanged(const char *className) { if (!className) { Q_ASSERT(app_pal); +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED emit qGuiApp->paletteChanged(*QGuiApplicationPrivate::app_pal); +QT_WARNING_POP } if (is_app_running && !is_app_closing) { @@ -3423,7 +3426,10 @@ void QGuiApplication::setFont(const QFont &font) if (emitChange && qGuiApp) { auto font = *QGuiApplicationPrivate::app_font; locker.unlock(); +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED emit qGuiApp->fontChanged(font); +QT_WARNING_POP QEvent event(QEvent::ApplicationFontChange); QGuiApplication::sendEvent(qGuiApp, &event); } diff --git a/src/gui/kernel/qguiapplication.h b/src/gui/kernel/qguiapplication.h index 6017cf513f..ac90e18ef9 100644 --- a/src/gui/kernel/qguiapplication.h +++ b/src/gui/kernel/qguiapplication.h @@ -190,8 +190,8 @@ Q_SIGNALS: #endif void applicationDisplayNameChanged(); #if QT_DEPRECATED_SINCE(6, 0) - void paletteChanged(const QPalette &pal); - void fontChanged(const QFont &font); + QT_DEPRECATED_VERSION_X_6_0("Handle QEvent::ApplicationPaletteChange instead") void paletteChanged(const QPalette &pal); + QT_DEPRECATED_VERSION_X_6_0("Handle QEvent::ApplicationFontChange instead") void fontChanged(const QFont &font); #endif protected: bool event(QEvent *) override; |