diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-08-11 08:45:54 +1000 |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-08-11 08:45:54 +1000 |
| commit | 6bb93ab2fd79ae0a04c826d9027503b644b6e374 (patch) | |
| tree | 060d9765cf3f009c86fe6e421dac4ea8930d076e /src/gui/styles/qcommonstyle_p.h | |
| parent | 40db84c97769141f3f2351de1b2d5c64904fe5c2 (diff) | |
| parent | 6c3c9d812a730d5bc1bcd6261befe077a65be594 (diff) | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/gui/styles/qcommonstyle_p.h')
| -rw-r--r-- | src/gui/styles/qcommonstyle_p.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/gui/styles/qcommonstyle_p.h b/src/gui/styles/qcommonstyle_p.h index f2af5b23b..cff46e69d 100644 --- a/src/gui/styles/qcommonstyle_p.h +++ b/src/gui/styles/qcommonstyle_p.h @@ -122,20 +122,7 @@ public: } #endif mutable QIcon tabBarcloseButtonIcon; - -//icon detection on X11 -#ifdef Q_WS_X11 - void lookupIconTheme() const; int lookupToolButtonStyle() const; - QIcon createIcon(const QString &) const; - QPixmap findIcon(int size, const QString &) const; - QPixmap findIconHelper(int size, const QString &, const QString &, QStringList &visited) const; - QIconTheme parseIndexFile(const QString &themeName) const; - mutable QString themeName; - mutable QStringList iconDirs; - mutable QHash <QString, QIconTheme> themeList; -#endif - }; QT_END_NAMESPACE |