diff options
author | Sami Merila <sami.merila@nokia.com> | 2010-03-05 09:08:37 (GMT) |
---|---|---|
committer | Sami Merila <sami.merila@nokia.com> | 2010-03-05 09:08:37 (GMT) |
commit | 5dba125fb953718d8282ff317a6ff34b612bcf45 (patch) | |
tree | ebdf2ada09d08e9ec6ae5c36f38a81911ec96a89 /tests/auto/qicon/tst_qicon.cpp | |
parent | 68eea46d309ff82e45c243a7689013f36454c85b (diff) | |
parent | 92c42901344ae654d8bc102e566d47d735cb3954 (diff) | |
download | Qt-5dba125fb953718d8282ff317a6ff34b612bcf45.zip Qt-5dba125fb953718d8282ff317a6ff34b612bcf45.tar.gz Qt-5dba125fb953718d8282ff317a6ff34b612bcf45.tar.bz2 |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
Diffstat (limited to 'tests/auto/qicon/tst_qicon.cpp')
-rw-r--r-- | tests/auto/qicon/tst_qicon.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/auto/qicon/tst_qicon.cpp b/tests/auto/qicon/tst_qicon.cpp index f861e40..fae9cc0 100644 --- a/tests/auto/qicon/tst_qicon.cpp +++ b/tests/auto/qicon/tst_qicon.cpp @@ -86,8 +86,14 @@ private slots: private: QString oldCurrentDir; + + const static QIcon staticIcon; }; +// Creating an icon statically should not cause a crash. +// But we do not officially support this. See QTBUG-8666 +const QIcon tst_QIcon::staticIcon = QIcon::fromTheme("edit-find"); + void tst_QIcon::init() { QString srcdir(QLatin1String(SRCDIR)); |