summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qwindow.h
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@woboq.com>2012-04-30 14:26:41 +0200
committerQt by Nokia <qt-info@nokia.com>2012-05-02 11:14:09 +0200
commit36b3a6ad3818b6c8d0849d5e5d63de22c2a2a430 (patch)
tree209a6267ce8ca7a05ae5f9a46b37e6c8255cfbc9 /src/gui/kernel/qwindow.h
parentbcd477e0bc48bb028193d7707d1ecfbd61b5bdc1 (diff)
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 <frederik.gladhorn@nokia.com>
Diffstat (limited to 'src/gui/kernel/qwindow.h')
-rw-r--r--src/gui/kernel/qwindow.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/kernel/qwindow.h b/src/gui/kernel/qwindow.h
index 118e3ec25f..c2c81fd2d7 100644
--- a/src/gui/kernel/qwindow.h
+++ b/src/gui/kernel/qwindow.h
@@ -102,7 +102,9 @@ public:
void setSurfaceType(SurfaceType surfaceType);
SurfaceType surfaceType() const;
- QT_DEPRECATED bool visible() const;
+#if QT_DEPRECATED_SINCE(5, 0)
+ QT_DEPRECATED inline bool visible() const { return isVisible(); }
+#endif
bool isVisible() const;