summaryrefslogtreecommitdiffstats
path: root/tests/auto/gui/kernel/qguivariant/test
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/gui/kernel/qguivariant/test')
-rw-r--r--tests/auto/gui/kernel/qguivariant/test/CMakeLists.txt11
-rw-r--r--tests/auto/gui/kernel/qguivariant/test/black.pngbin697 -> 0 bytes
-rw-r--r--tests/auto/gui/kernel/qguivariant/test/black2.pngbin697 -> 0 bytes
-rw-r--r--tests/auto/gui/kernel/qguivariant/test/test.pro1
-rw-r--r--tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp28
-rw-r--r--tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.qrc6
6 files changed, 0 insertions, 46 deletions
diff --git a/tests/auto/gui/kernel/qguivariant/test/CMakeLists.txt b/tests/auto/gui/kernel/qguivariant/test/CMakeLists.txt
index 93efaf2aeb..40671c920c 100644
--- a/tests/auto/gui/kernel/qguivariant/test/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qguivariant/test/CMakeLists.txt
@@ -14,17 +14,6 @@ qt_add_test(tst_qguivariant
)
# Resources:
-set(tst_qguivariant_resource_files
- "black.png"
- "black2.png"
-)
-
-qt_add_resource(tst_qguivariant "tst_qguivariant"
- PREFIX
- "/"
- FILES
- ${tst_qguivariant_resource_files}
-)
set(qguivariant_resource_files
"data"
)
diff --git a/tests/auto/gui/kernel/qguivariant/test/black.png b/tests/auto/gui/kernel/qguivariant/test/black.png
deleted file mode 100644
index 6c94085ed5..0000000000
--- a/tests/auto/gui/kernel/qguivariant/test/black.png
+++ /dev/null
Binary files differ
diff --git a/tests/auto/gui/kernel/qguivariant/test/black2.png b/tests/auto/gui/kernel/qguivariant/test/black2.png
deleted file mode 100644
index 6c94085ed5..0000000000
--- a/tests/auto/gui/kernel/qguivariant/test/black2.png
+++ /dev/null
Binary files differ
diff --git a/tests/auto/gui/kernel/qguivariant/test/test.pro b/tests/auto/gui/kernel/qguivariant/test/test.pro
index 39e4b3b71f..e285001b07 100644
--- a/tests/auto/gui/kernel/qguivariant/test/test.pro
+++ b/tests/auto/gui/kernel/qguivariant/test/test.pro
@@ -1,7 +1,6 @@
CONFIG += testcase
TARGET = tst_qguivariant
SOURCES += tst_qguivariant.cpp
-RESOURCES = tst_qguivariant.qrc
INCLUDEPATH += $$PWD/../../../../other/qvariant_common
QT += testlib
RESOURCES += qguivariant.qrc
diff --git a/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp b/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp
index 12998add71..8b0abd61cc 100644
--- a/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp
+++ b/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp
@@ -109,7 +109,6 @@ private slots:
void guiVariantAtExit();
- void iconEquality();
void qt4QPolygonFDataStream();
};
@@ -740,33 +739,6 @@ void tst_QGuiVariant::guiVariantAtExit()
QVERIFY(true);
}
-void tst_QGuiVariant::iconEquality()
-{
- QIcon i;
- QVariant a = i;
- QVariant b = i;
- QCOMPARE(a, b);
-
- i = QIcon(":/black.png");
- a = i;
- QVERIFY(a != b);
-
- b = a;
- QCOMPARE(a, b);
-
- i = QIcon(":/black2.png");
- a = i;
- QVERIFY(a != b);
-
- b = i;
- QCOMPARE(a, b);
-
- // This is a "different" QIcon
- // even if the contents are the same
- b = QIcon(":/black2.png");
- QVERIFY(a != b);
-}
-
void tst_QGuiVariant::qt4QPolygonFDataStream()
{
qRegisterMetaTypeStreamOperators<QPolygonF>();
diff --git a/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.qrc b/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.qrc
deleted file mode 100644
index 15cfde5788..0000000000
--- a/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.qrc
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource prefix="/">
-<file>black.png</file>
-<file>black2.png</file>
-</qresource>
-</RCC>