diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-03-20 13:46:57 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-03-20 13:49:28 +0100 |
| commit | 76c0be34cd4ff4564693162fa7528463e23ce9d8 (patch) | |
| tree | f165b7bc319548fb0082365411a871028f92e89e /src/gui/kernel/qplatformtheme.h | |
| parent | 27b4fe96b59e9e63d1e570e802c072e9afdfb2d4 (diff) | |
| parent | 36cb3f3f655a9090c82de609010cbfb88651a0f3 (diff) | |
Merge branch 'dev' into stable
This starts Qt 5.1 release cycle
Conflicts:
src/gui/text/qfontdatabase.cpp
src/gui/text/qharfbuzz_copy_p.h
src/widgets/kernel/qapplication.cpp
src/widgets/kernel/qcoreapplication.cpp
Change-Id: I72fbf83ab3c2206aeea1b089428b0fc2a89bd62b
Diffstat (limited to 'src/gui/kernel/qplatformtheme.h')
| -rw-r--r-- | src/gui/kernel/qplatformtheme.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/gui/kernel/qplatformtheme.h b/src/gui/kernel/qplatformtheme.h index 3ac2b904d2..0e95321102 100644 --- a/src/gui/kernel/qplatformtheme.h +++ b/src/gui/kernel/qplatformtheme.h @@ -53,10 +53,9 @@ #include <QtCore/QtGlobal> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE +class QIconEngine; class QMenu; class QMenuBar; class QPlatformMenuItem; @@ -272,11 +271,11 @@ public: virtual QPixmap standardPixmap(StandardPixmap sp, const QSizeF &size) const; virtual QPixmap fileIconPixmap(const QFileInfo &fileInfo, const QSizeF &size) const; + virtual QIconEngine *createIconEngine(const QString &iconName) const; + static QVariant defaultThemeHint(ThemeHint hint); }; QT_END_NAMESPACE -QT_END_HEADER - #endif // QPLATFORMTHEME_H |