summaryrefslogtreecommitdiffstats
path: root/tests/auto/qicon
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2009-10-01 10:40:56 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2009-10-01 10:43:59 (GMT)
commitdde7e6835ddaa8e1531de57887686c6c4f89d83d (patch)
tree600fba053aa2ae9b0bb6225dc587011d0b34044c /tests/auto/qicon
parent91c7b2d6cfa4f8ac63d12c1da131e1813a3c690c (diff)
downloadQt-dde7e6835ddaa8e1531de57887686c6c4f89d83d.zip
Qt-dde7e6835ddaa8e1531de57887686c6c4f89d83d.tar.gz
Qt-dde7e6835ddaa8e1531de57887686c6c4f89d83d.tar.bz2
Fix tst_QIcon::isNull
The test tries to load a file from an unsuported format. The problem is that tga is a supported format if KDE plugins are installed It is unlikely that cpp will ever be a supported image format Reviewed-by: paul
Diffstat (limited to 'tests/auto/qicon')
-rw-r--r--tests/auto/qicon/image.tgabin51708 -> 0 bytes
-rw-r--r--tests/auto/qicon/qicon.pro4
-rw-r--r--tests/auto/qicon/tst_qicon.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/qicon/image.tga b/tests/auto/qicon/image.tga
deleted file mode 100644
index 0cd507d..0000000
--- a/tests/auto/qicon/image.tga
+++ /dev/null
Binary files differ
diff --git a/tests/auto/qicon/qicon.pro b/tests/auto/qicon/qicon.pro
index 0c9c7e9..8ae252f 100644
--- a/tests/auto/qicon/qicon.pro
+++ b/tests/auto/qicon/qicon.pro
@@ -6,9 +6,9 @@ RESOURCES = tst_qicon.qrc
wince* {
QT += xml svg
addFiles.sources += $$_PRO_FILE_PWD_/*.png
- addFiles.sources += $$_PRO_FILE_PWD_/*.tga
addFiles.sources += $$_PRO_FILE_PWD_/*.svg
addFiles.sources += $$_PRO_FILE_PWD_/*.svgz
+ addFiles.sources += $$_PRO_FILE_PWD_/tst_qicon.cpp
addFiles.path = .
DEPLOYMENT += addFiles
@@ -16,7 +16,7 @@ wince* {
DEFINES += SRCDIR=\\\".\\\"
} else:symbian {
QT += xml svg
- addFiles.sources = *.png *.tga *.svg *.svgz
+ addFiles.sources = *.png tst_qicon.cpp *.svg *.svgz
addFiles.path = .
plugins.sources = qsvgicon.dll
plugins.path = iconengines
diff --git a/tests/auto/qicon/tst_qicon.cpp b/tests/auto/qicon/tst_qicon.cpp
index 96d1d6c..f5baeaa 100644
--- a/tests/auto/qicon/tst_qicon.cpp
+++ b/tests/auto/qicon/tst_qicon.cpp
@@ -242,7 +242,7 @@ void tst_QIcon::isNull() {
const QString prefix = QLatin1String(SRCDIR) + QLatin1String("/");
// test string constructor with existing file but unsupported format
- QIcon iconUnsupportedFormat = QIcon(prefix + "image.tga");
+ QIcon iconUnsupportedFormat = QIcon(prefix + "tst_qicon.cpp");
QVERIFY(!iconUnsupportedFormat.isNull());
QVERIFY(!iconUnsupportedFormat.actualSize(QSize(32, 32)).isValid());