summaryrefslogtreecommitdiffstats
path: root/src/gui/image/qicon.h
diff options
context:
space:
mode:
authorBjørn Erik Nilsen <bjorn.nilsen@nokia.com>2009-08-17 11:50:47 (GMT)
committerBjørn Erik Nilsen <bjorn.nilsen@nokia.com>2009-08-17 11:50:47 (GMT)
commit17d6f2a59fe2b170087cdf7074807c6a2dce1043 (patch)
tree64af0faa3146cd516b9887c9344ebd03408bafcc /src/gui/image/qicon.h
parent103334ced3b0cb6e69a1ed3075d9b81e591f37e9 (diff)
parent3d50220423b96a84f1ca4c0f5ef9246345aad359 (diff)
downloadQt-17d6f2a59fe2b170087cdf7074807c6a2dce1043.zip
Qt-17d6f2a59fe2b170087cdf7074807c6a2dce1043.tar.gz
Qt-17d6f2a59fe2b170087cdf7074807c6a2dce1043.tar.bz2
Merge commit 'qt/master' into kinetic-graphicseffect
Diffstat (limited to 'src/gui/image/qicon.h')
-rw-r--r--src/gui/image/qicon.h12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/gui/image/qicon.h b/src/gui/image/qicon.h
index c318e14..7debb02 100644
--- a/src/gui/image/qicon.h
+++ b/src/gui/image/qicon.h
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
@@ -97,6 +97,16 @@ public:
QList<QSize> availableSizes(Mode mode = Normal, State state = Off) const;
+ static QIcon fromTheme(const QString &name, const QIcon &fallback = QIcon());
+ static bool hasThemeIcon(const QString &name);
+
+ static QStringList themeSearchPaths();
+ static void setThemeSearchPaths(const QStringList &searchpath);
+
+ static QString themeName();
+ static void setThemeName(const QString &path);
+
+
#ifdef QT3_SUPPORT
enum Size { Small, Large, Automatic = Small };
static QT3_SUPPORT void setPixmapSize(Size which, const QSize &size);