From 36b3a6ad3818b6c8d0849d5e5d63de22c2a2a430 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Mon, 30 Apr 2012 14:26:41 +0200 Subject: Fix compilation of public headers with QT_NO_DEPRECATED defined Put the functions in QT_DEPRECATED_SINCE if possible QPluginLoader::staticInstances is not documented as deprecated, and do not reference any alternative use. So I unmarked it as deprecated. Change-Id: I556c3f3657fb0490dd5543fcc56718fe9bd394e7 Reviewed-by: Frederik Gladhorn --- src/gui/kernel/qguiapplication.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/gui/kernel/qguiapplication.h') diff --git a/src/gui/kernel/qguiapplication.h b/src/gui/kernel/qguiapplication.h index 75a0f6cd4b..a741d13eb3 100644 --- a/src/gui/kernel/qguiapplication.h +++ b/src/gui/kernel/qguiapplication.h @@ -90,7 +90,7 @@ public: static QWindow *modalWindow(); -#ifdef QT_DEPRECATED +#if QT_DEPRECATED_SINCE(5, 0) static QT_DEPRECATED QWindow *activeWindow() { return focusWindow(); } #endif static QWindow *focusWindow(); @@ -130,7 +130,9 @@ public: static void setDesktopSettingsAware(bool on); static bool desktopSettingsAware(); - QT_DEPRECATED QInputPanel *inputPanel() const; +#if QT_DEPRECATED_SINCE(5, 0) + QT_DEPRECATED QInputPanel *inputPanel() const { return inputMethod(); } +#endif QInputMethod *inputMethod() const; static QPlatformNativeInterface *platformNativeInterface(); -- cgit v1.2.3