diff options
author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-23 13:36:29 +0100 |
---|---|---|
committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-23 14:10:58 +0100 |
commit | 3b512ae142017f105f297467f74dc28d3cb9030a (patch) | |
tree | 9e131e23c01537f051851a1da9576c1e1ddf5ba2 /src/widgets/kernel/qapplication.h | |
parent | e20c4730192f312881591fb50e571af0a88fe421 (diff) | |
parent | f956f9a83603a3df5651e3238c24e8df37558d6e (diff) |
Merge master into api_changes
Change-Id: I93551e4d13a1b0815b359b9415060e9089477db1
Diffstat (limited to 'src/widgets/kernel/qapplication.h')
-rw-r--r-- | src/widgets/kernel/qapplication.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/widgets/kernel/qapplication.h b/src/widgets/kernel/qapplication.h index 08e29e449e..6c1ced1623 100644 --- a/src/widgets/kernel/qapplication.h +++ b/src/widgets/kernel/qapplication.h @@ -111,8 +111,9 @@ public: enum ColorSpec { NormalColor=0, CustomColor=1, ManyColor=2 }; static int colorSpec(); static void setColorSpec(int); - // ### Qt4 compatibility, remove? - static inline void setGraphicsSystem(const QString &) {} +#if QT_DEPRECATED_SINCE(5, 0) + QT_DEPRECATED static inline void setGraphicsSystem(const QString &) {} +#endif using QGuiApplication::palette; static QPalette palette(const QWidget *); |