Long live Qt for S60!

70 files changed, 474 insertions, 0 deletions

diff --git a/tests/auto/qlabel/.gitignore b/tests/auto/qlabel/.gitignore
new file mode 100644
index 0000000..e050d7a
--- /dev/null
+++ b/tests/auto/qlabel/.gitignore
@@ -0,0 +1 @@
+tst_qlabel
diff --git a/tests/auto/qlabel/green.png b/tests/auto/qlabel/green.png
new file mode 100644
index 0000000..dfc95d4
--- /dev/null
+++ b/tests/auto/qlabel/green.png
diff --git a/tests/auto/qlabel/qlabel.pro b/tests/auto/qlabel/qlabel.pro
new file mode 100644
index 0000000..c274b4a
--- /dev/null
+++ b/tests/auto/qlabel/qlabel.pro
@@ -0,0 +1,19 @@
+load(qttest_p4)
+SOURCES  += tst_qlabel.cpp
+
+wince*:{
+    DEFINES += SRCDIR=\\\"\\\"
+} !symbian {
+    DEFINES += SRCDIR=\\\"$$PWD/\\\"
+}
+
+wince*|symbian {
+    addFiles.sources = *.png testdata
+    addFiles.path = .
+    DEPLOYMENT += addFiles
+}
+
+
+
+
+
diff --git a/tests/auto/qlabel/red.png b/tests/auto/qlabel/red.png
new file mode 100644
index 0000000..4a843e7
--- /dev/null
+++ b/tests/auto/qlabel/red.png
diff --git a/tests/auto/qlabel/testdata/acc_01/res_Windows_data0.qsnap b/tests/auto/qlabel/testdata/acc_01/res_Windows_data0.qsnap
new file mode 100644
index 0000000..522c173
--- /dev/null
+++ b/tests/auto/qlabel/testdata/acc_01/res_Windows_data0.qsnap
diff --git a/tests/auto/qlabel/testdata/acc_01/res_Windows_win32_data0.qsnap b/tests/auto/qlabel/testdata/acc_01/res_Windows_win32_data0.qsnap
new file mode 100644
index 0000000..acd881d
--- /dev/null
+++ b/tests/auto/qlabel/testdata/acc_01/res_Windows_win32_data0.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data0.qsnap b/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data0.qsnap
new file mode 100644
index 0000000..9e2c176
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data0.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data1.qsnap b/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data1.qsnap
new file mode 100644
index 0000000..dcd708f
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data1.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data10.qsnap b/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data10.qsnap
new file mode 100644
index 0000000..2131f59
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data10.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data2.qsnap b/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data2.qsnap
new file mode 100644
index 0000000..2edd976
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data2.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data3.qsnap b/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data3.qsnap
new file mode 100644
index 0000000..2ce28d9
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data3.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data4.qsnap b/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data4.qsnap
new file mode 100644
index 0000000..6476f6c
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data4.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data5.qsnap b/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data5.qsnap
new file mode 100644
index 0000000..6039742
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data5.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data6.qsnap b/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data6.qsnap
new file mode 100644
index 0000000..477d203
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data6.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data7.qsnap b/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data7.qsnap
new file mode 100644
index 0000000..c673f40
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data7.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data8.qsnap b/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data8.qsnap
new file mode 100644
index 0000000..a490f77
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data8.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data9.qsnap b/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data9.qsnap
new file mode 100644
index 0000000..33342d3
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data9.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data0.qsnap b/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data0.qsnap
new file mode 100644
index 0000000..3fe9a82
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data0.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data1.qsnap b/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data1.qsnap
new file mode 100644
index 0000000..175235d
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data1.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data10.qsnap b/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data10.qsnap
new file mode 100644
index 0000000..b1ac74b
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data10.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data2.qsnap b/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data2.qsnap
new file mode 100644
index 0000000..fdd3c7c
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data2.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data3.qsnap b/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data3.qsnap
new file mode 100644
index 0000000..caa47f7
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data3.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data4.qsnap b/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data4.qsnap
new file mode 100644
index 0000000..a0d2498
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data4.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data5.qsnap b/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data5.qsnap
new file mode 100644
index 0000000..756d9fe
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data5.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data6.qsnap b/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data6.qsnap
new file mode 100644
index 0000000..f973d14
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data6.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data7.qsnap b/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data7.qsnap
new file mode 100644
index 0000000..720d807
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data7.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data8.qsnap b/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data8.qsnap
new file mode 100644
index 0000000..20fd48e
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data8.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data9.qsnap b/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data9.qsnap
new file mode 100644
index 0000000..7db7c97
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data9.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data0.qsnap b/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data0.qsnap
new file mode 100644
index 0000000..d9912d8
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data0.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data1.qsnap b/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data1.qsnap
new file mode 100644
index 0000000..bfc3a64
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data1.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data10.qsnap b/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data10.qsnap
new file mode 100644
index 0000000..09a35ef
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data10.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data2.qsnap b/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data2.qsnap
new file mode 100644
index 0000000..14e1123
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data2.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data3.qsnap b/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data3.qsnap
new file mode 100644
index 0000000..6ef864e
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data3.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data4.qsnap b/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data4.qsnap
new file mode 100644
index 0000000..eb02900
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data4.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data5.qsnap b/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data5.qsnap
new file mode 100644
index 0000000..439e196
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data5.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data6.qsnap b/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data6.qsnap
new file mode 100644
index 0000000..9637d17
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data6.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data7.qsnap b/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data7.qsnap
new file mode 100644
index 0000000..9a55346
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data7.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data8.qsnap b/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data8.qsnap
new file mode 100644
index 0000000..0d9184c
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data8.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data9.qsnap b/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data9.qsnap
new file mode 100644
index 0000000..f2873b1
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data9.qsnap
diff --git a/tests/auto/qlabel/testdata/setIndent/indentRes_Motif_data0.qsnap b/tests/auto/qlabel/testdata/setIndent/indentRes_Motif_data0.qsnap
new file mode 100644
index 0000000..1385a50
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setIndent/indentRes_Motif_data0.qsnap
diff --git a/tests/auto/qlabel/testdata/setIndent/indentRes_Motif_data1.qsnap b/tests/auto/qlabel/testdata/setIndent/indentRes_Motif_data1.qsnap
new file mode 100644
index 0000000..38223cf
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setIndent/indentRes_Motif_data1.qsnap
diff --git a/tests/auto/qlabel/testdata/setIndent/indentRes_Motif_data2.qsnap b/tests/auto/qlabel/testdata/setIndent/indentRes_Motif_data2.qsnap
new file mode 100644
index 0000000..0b946a4
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setIndent/indentRes_Motif_data2.qsnap
diff --git a/tests/auto/qlabel/testdata/setIndent/indentRes_Windows_data0.qsnap b/tests/auto/qlabel/testdata/setIndent/indentRes_Windows_data0.qsnap
new file mode 100644
index 0000000..e1d2c41
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setIndent/indentRes_Windows_data0.qsnap
diff --git a/tests/auto/qlabel/testdata/setIndent/indentRes_Windows_data1.qsnap b/tests/auto/qlabel/testdata/setIndent/indentRes_Windows_data1.qsnap
new file mode 100644
index 0000000..b7bdee5
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setIndent/indentRes_Windows_data1.qsnap
diff --git a/tests/auto/qlabel/testdata/setIndent/indentRes_Windows_data2.qsnap b/tests/auto/qlabel/testdata/setIndent/indentRes_Windows_data2.qsnap
new file mode 100644
index 0000000..a20492e
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setIndent/indentRes_Windows_data2.qsnap
diff --git a/tests/auto/qlabel/testdata/setIndent/indentRes_Windows_win32_data0.qsnap b/tests/auto/qlabel/testdata/setIndent/indentRes_Windows_win32_data0.qsnap
new file mode 100644
index 0000000..85e3306
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setIndent/indentRes_Windows_win32_data0.qsnap
diff --git a/tests/auto/qlabel/testdata/setIndent/indentRes_Windows_win32_data1.qsnap b/tests/auto/qlabel/testdata/setIndent/indentRes_Windows_win32_data1.qsnap
new file mode 100644
index 0000000..3bf991f
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setIndent/indentRes_Windows_win32_data1.qsnap
diff --git a/tests/auto/qlabel/testdata/setIndent/indentRes_Windows_win32_data2.qsnap b/tests/auto/qlabel/testdata/setIndent/indentRes_Windows_win32_data2.qsnap
new file mode 100644
index 0000000..f05a9dc
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setIndent/indentRes_Windows_win32_data2.qsnap
diff --git a/tests/auto/qlabel/testdata/setPixmap/Vpix_Motif_data0.qsnap b/tests/auto/qlabel/testdata/setPixmap/Vpix_Motif_data0.qsnap
new file mode 100644
index 0000000..d7428df
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setPixmap/Vpix_Motif_data0.qsnap
diff --git a/tests/auto/qlabel/testdata/setPixmap/Vpix_Windows_data0.qsnap b/tests/auto/qlabel/testdata/setPixmap/Vpix_Windows_data0.qsnap
new file mode 100644
index 0000000..905acd1
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setPixmap/Vpix_Windows_data0.qsnap
diff --git a/tests/auto/qlabel/testdata/setPixmap/Vpix_Windows_win32_data0.qsnap b/tests/auto/qlabel/testdata/setPixmap/Vpix_Windows_win32_data0.qsnap
new file mode 100644
index 0000000..e1dea4b
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setPixmap/Vpix_Windows_win32_data0.qsnap
diff --git a/tests/auto/qlabel/testdata/setPixmap/empty_Motif_data0.qsnap b/tests/auto/qlabel/testdata/setPixmap/empty_Motif_data0.qsnap
new file mode 100644
index 0000000..055ccda
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setPixmap/empty_Motif_data0.qsnap
diff --git a/tests/auto/qlabel/testdata/setPixmap/empty_Windows_data0.qsnap b/tests/auto/qlabel/testdata/setPixmap/empty_Windows_data0.qsnap
new file mode 100644
index 0000000..64b7076
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setPixmap/empty_Windows_data0.qsnap
diff --git a/tests/auto/qlabel/testdata/setPixmap/empty_Windows_win32_data0.qsnap b/tests/auto/qlabel/testdata/setPixmap/empty_Windows_win32_data0.qsnap
new file mode 100644
index 0000000..fb0ea22
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setPixmap/empty_Windows_win32_data0.qsnap
diff --git a/tests/auto/qlabel/testdata/setPixmap/scaledVpix_Motif_data0.qsnap b/tests/auto/qlabel/testdata/setPixmap/scaledVpix_Motif_data0.qsnap
new file mode 100644
index 0000000..ae9cda5
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setPixmap/scaledVpix_Motif_data0.qsnap
diff --git a/tests/auto/qlabel/testdata/setPixmap/scaledVpix_Windows_data0.qsnap b/tests/auto/qlabel/testdata/setPixmap/scaledVpix_Windows_data0.qsnap
new file mode 100644
index 0000000..e21af32
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setPixmap/scaledVpix_Windows_data0.qsnap
diff --git a/tests/auto/qlabel/testdata/setPixmap/scaledVpix_Windows_win32_data0.qsnap b/tests/auto/qlabel/testdata/setPixmap/scaledVpix_Windows_win32_data0.qsnap
new file mode 100644
index 0000000..32cc406
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setPixmap/scaledVpix_Windows_win32_data0.qsnap
diff --git a/tests/auto/qlabel/testdata/setText/res_Motif_data0.qsnap b/tests/auto/qlabel/testdata/setText/res_Motif_data0.qsnap
new file mode 100644
index 0000000..7191b51
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setText/res_Motif_data0.qsnap
diff --git a/tests/auto/qlabel/testdata/setText/res_Motif_data1.qsnap b/tests/auto/qlabel/testdata/setText/res_Motif_data1.qsnap
new file mode 100644
index 0000000..d943ce96
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setText/res_Motif_data1.qsnap
diff --git a/tests/auto/qlabel/testdata/setText/res_Motif_data2.qsnap b/tests/auto/qlabel/testdata/setText/res_Motif_data2.qsnap
new file mode 100644
index 0000000..946432e
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setText/res_Motif_data2.qsnap
diff --git a/tests/auto/qlabel/testdata/setText/res_Motif_data3.qsnap b/tests/auto/qlabel/testdata/setText/res_Motif_data3.qsnap
new file mode 100644
index 0000000..dc5ac0c
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setText/res_Motif_data3.qsnap
diff --git a/tests/auto/qlabel/testdata/setText/res_Windows_data0.qsnap b/tests/auto/qlabel/testdata/setText/res_Windows_data0.qsnap
new file mode 100644
index 0000000..2ab392e
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setText/res_Windows_data0.qsnap
diff --git a/tests/auto/qlabel/testdata/setText/res_Windows_data1.qsnap b/tests/auto/qlabel/testdata/setText/res_Windows_data1.qsnap
new file mode 100644
index 0000000..5769459
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setText/res_Windows_data1.qsnap
diff --git a/tests/auto/qlabel/testdata/setText/res_Windows_data2.qsnap b/tests/auto/qlabel/testdata/setText/res_Windows_data2.qsnap
new file mode 100644
index 0000000..b4206c2
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setText/res_Windows_data2.qsnap
diff --git a/tests/auto/qlabel/testdata/setText/res_Windows_data3.qsnap b/tests/auto/qlabel/testdata/setText/res_Windows_data3.qsnap
new file mode 100644
index 0000000..f120ac2
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setText/res_Windows_data3.qsnap
diff --git a/tests/auto/qlabel/testdata/setText/res_Windows_win32_data0.qsnap b/tests/auto/qlabel/testdata/setText/res_Windows_win32_data0.qsnap
new file mode 100644
index 0000000..7644f53
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setText/res_Windows_win32_data0.qsnap
diff --git a/tests/auto/qlabel/testdata/setText/res_Windows_win32_data1.qsnap b/tests/auto/qlabel/testdata/setText/res_Windows_win32_data1.qsnap
new file mode 100644
index 0000000..7902b1b
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setText/res_Windows_win32_data1.qsnap
diff --git a/tests/auto/qlabel/testdata/setText/res_Windows_win32_data2.qsnap b/tests/auto/qlabel/testdata/setText/res_Windows_win32_data2.qsnap
new file mode 100644
index 0000000..60bd075
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setText/res_Windows_win32_data2.qsnap
diff --git a/tests/auto/qlabel/testdata/setText/res_Windows_win32_data3.qsnap b/tests/auto/qlabel/testdata/setText/res_Windows_win32_data3.qsnap
new file mode 100644
index 0000000..c1dcb27
--- /dev/null
+++ b/tests/auto/qlabel/testdata/setText/res_Windows_win32_data3.qsnap
diff --git a/tests/auto/qlabel/tst_qlabel.cpp b/tests/auto/qlabel/tst_qlabel.cpp
new file mode 100644
index 0000000..5a46bf7
--- /dev/null
+++ b/tests/auto/qlabel/tst_qlabel.cpp
@@ -0,0 +1,454 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** 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 qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#include <QtTest/QtTest>
+
+
+#include "qlabel.h"
+#include <qapplication.h>
+#include <qboxlayout.h>
+#include <qlabel.h>
+#include <qlineedit.h>
+#include <qmovie.h>
+#include <qpicture.h>
+
+//TESTED_CLASS=
+//TESTED_FILES=
+#if defined(Q_OS_SYMBIAN)
+# define SRCDIR "."
+#endif
+
+class Widget : public QWidget
+{
+public:
+    Widget() { }
+
+    QList<QEvent::Type> events;
+
+protected:
+    bool event(QEvent *ev) {
+        events.append(ev->type());
+        return QWidget::event(ev);
+    }
+
+};
+
+class tst_QLabel : public QObject
+{
+Q_OBJECT
+
+public:
+    tst_QLabel();
+    virtual ~tst_QLabel();
+
+
+public slots:
+    void initTestCase();
+    void cleanupTestCase();
+    void init();
+    void cleanup();
+private slots:
+    void getSetCheck();
+    void text();
+    void setText_data();
+    void setText();
+    void textFormat();
+    void setTextFormat();
+    void buddy();
+    void setBuddy();
+    void setFont();
+    void setNum();
+    void clear();
+    void wordWrap();
+    void eventPropagation_data();
+    void eventPropagation();
+    void focusPolicy();
+    
+    void task190318_sizes();
+
+    void sizeHint();
+    
+    void task226479_movieResize();
+    void emptyPixmap();
+
+private:
+    QLabel *testWidget;
+    QPointer<Widget> test_box;
+    QPointer<QLabel> test_label;
+    QLineEdit *test_edit;
+};
+
+// Testing get/set functions
+void tst_QLabel::getSetCheck()
+{
+    QLabel obj1;
+    // bool QLabel::wordWrap()
+    // void QLabel::setWordWrap(bool)
+    obj1.setWordWrap(false);
+    QCOMPARE(false, obj1.wordWrap());
+    obj1.setWordWrap(true);
+    QCOMPARE(true, obj1.wordWrap());
+
+    // QWidget * QLabel::buddy()
+    // void QLabel::setBuddy(QWidget *)
+    QWidget *var2 = new QWidget();
+    obj1.setBuddy(var2);
+    QCOMPARE(var2, obj1.buddy());
+    obj1.setBuddy((QWidget *)0);
+    QCOMPARE((QWidget *)0, obj1.buddy());
+    delete var2;
+
+    // QMovie * QLabel::movie()
+    // void QLabel::setMovie(QMovie *)
+    QMovie *var3 = new QMovie;
+    obj1.setMovie(var3);
+    QCOMPARE(var3, obj1.movie());
+    obj1.setMovie((QMovie *)0);
+    QCOMPARE((QMovie *)0, obj1.movie());
+    delete var3;
+}
+
+
+tst_QLabel::tst_QLabel(): test_box(0)
+{
+}
+
+tst_QLabel::~tst_QLabel()
+{
+}
+
+void tst_QLabel::initTestCase()
+{
+    // Create the test class
+    testWidget = new QLabel(0);
+    testWidget->resize( 200, 200 );
+    testWidget->show();
+}
+
+void tst_QLabel::cleanupTestCase()
+{
+    delete testWidget;
+    testWidget = 0;
+    if (test_box)
+        delete test_box;
+}
+
+void tst_QLabel::init()
+{
+    testWidget->setTextFormat( Qt::AutoText );
+    testWidget->setBuddy( 0 );
+    testWidget->setIndent( 0 );
+    testWidget->setAlignment( Qt::AlignLeft | Qt::AlignVCenter );
+    testWidget->setScaledContents( FALSE );
+}
+
+void tst_QLabel::cleanup()
+{
+    if (QTest::currentTestFunction() == QLatin1String("setBuddy")) {
+	testWidget->show();
+
+	delete test_box; // this should delete tst_labl and test_edit as well.
+    }
+}
+
+void tst_QLabel::buddy()
+{
+    DEPENDS_ON( "setBuddy" );
+}
+
+void tst_QLabel::setBuddy()
+{
+#ifdef Q_WS_MAC
+    QSKIP("Set buddy doesn't make much sense on Mac OS X", SkipAll);
+#endif
+    testWidget->hide();
+
+    test_box = new Widget;
+    test_label= new QLabel( test_box );
+    test_label->setText( "&Test with a buddy" );
+    test_edit = new QLineEdit( test_box );
+    QVBoxLayout *layout = new QVBoxLayout(test_box);
+    layout->addWidget(test_label);
+    layout->addWidget(test_edit);
+    test_box->show();
+    qApp->setActiveWindow(test_box);
+    QVERIFY(test_box->isActiveWindow());
+
+    test_label->setBuddy( test_edit );
+    test_label->setFocus();
+    QVERIFY( !test_edit->hasFocus() );
+    QTest::keyClick( test_box, 't', Qt::AltModifier );
+    QVERIFY( test_edit->hasFocus() );
+}
+
+void tst_QLabel::text()
+{
+    DEPENDS_ON( "setText" );
+}
+
+void tst_QLabel::setText_data()
+{
+    QTest::addColumn<QString>("txt");
+    QTest::addColumn<QString>("font");
+
+    QString prefix = "";
+#ifdef Q_OS_WIN32
+    prefix = "win32_";
+#endif
+
+    QTest::newRow( QString(prefix + "data0").toLatin1() ) << QString("This is a single line") << QString("Helvetica");
+    QTest::newRow( QString(prefix + "data1").toLatin1() ) << QString("This is the first line\nThis is the second line") << QString("Courier");
+    QTest::newRow( QString(prefix + "data2").toLatin1() ) << QString("This is the first line\nThis is the second line\nThis is the third line") << QString("Helvetica");
+    QTest::newRow( QString(prefix + "data3").toLatin1() ) << QString("This is <b>bold</b> richtext") << QString("Courier");
+}
+
+void tst_QLabel::setText()
+{
+    QFETCH( QString, txt );
+    QFETCH( QString, font );
+    QFont f( font, 8 );
+    testWidget->setFont( f );
+    testWidget->setText( txt );
+    QCOMPARE( testWidget->text(), txt );
+}
+
+
+void tst_QLabel::textFormat()
+{
+    DEPENDS_ON( "setTextFormat" );
+}
+
+void tst_QLabel::setTextFormat()
+{
+    // lets' start with the simple stuff...
+    testWidget->setTextFormat( Qt::PlainText );
+    QVERIFY( testWidget->textFormat() == Qt::PlainText );
+
+    testWidget->setTextFormat( Qt::RichText );
+    QVERIFY( testWidget->textFormat() == Qt::RichText );
+
+#if QT_VERSION >= 0x030100
+    testWidget->setTextFormat( Qt::LogText );
+    QVERIFY( testWidget->textFormat() == Qt::LogText );
+#endif
+
+    testWidget->setTextFormat( Qt::AutoText );
+    QVERIFY( testWidget->textFormat() == Qt::AutoText );
+}
+
+
+void tst_QLabel::setFont()
+{
+    DEPENDS_ON( "setText" );
+}
+
+void tst_QLabel::setNum()
+{
+    testWidget->setText( "This is a text" );
+    testWidget->setNum( 12 );
+    QCOMPARE( testWidget->text(), QString("12") );
+    testWidget->setNum( 12.345 );
+    QCOMPARE( testWidget->text(), QString("12.345") );
+}
+
+void tst_QLabel::clear()
+{
+    const QString TEXT = "blah blah";
+    testWidget->setText(TEXT);
+    QCOMPARE(testWidget->text(), TEXT);
+    testWidget->clear();
+    QVERIFY(testWidget->text().isEmpty());
+}
+
+void tst_QLabel::wordWrap()
+{
+    QLabel label;
+
+    QVERIFY(!label.wordWrap());
+
+    label.setText("Plain Text");
+    QVERIFY(!label.wordWrap());
+
+    label.setText("<b>rich text</b>");
+    QVERIFY(!label.wordWrap());
+
+    label.setWordWrap(false);
+    label.setText("<b>rich text</b>");
+    QVERIFY(!label.wordWrap());
+}
+
+void tst_QLabel::eventPropagation_data()
+{
+    QTest::addColumn<QString>("text");
+    QTest::addColumn<int>("textInteractionFlags");
+    QTest::addColumn<int>("focusPolicy");
+    QTest::addColumn<bool>("propagation");
+
+    QTest::newRow("plain text1") << QString("plain text") << int(Qt::LinksAccessibleByMouse) << int(Qt::NoFocus) << true;
+    QTest::newRow("plain text2") << QString("plain text") << (int)Qt::TextSelectableByKeyboard << (int)Qt::ClickFocus << false;
+    QTest::newRow("plain text3") << QString("plain text") << (int)Qt::TextSelectableByMouse << (int)Qt::ClickFocus << false;
+    QTest::newRow("plain text4") << QString("plain text") << (int)Qt::NoTextInteraction << (int)Qt::NoFocus << true;
+    QTest::newRow("rich text1") << QString("<b>rich text</b>") << (int)Qt::LinksAccessibleByMouse << (int)Qt::NoFocus << false;
+    QTest::newRow("rich text2") << QString("<b>rich text</b>") << (int)Qt::TextSelectableByKeyboard << (int)Qt::ClickFocus << false;
+    QTest::newRow("rich text3") << QString("<b>rich text</b>") << (int)Qt::TextSelectableByMouse << (int)Qt::ClickFocus << false;
+    QTest::newRow("rich text4") << QString("<b>rich text</b>") << (int)Qt::NoTextInteraction << (int)Qt::NoFocus << true;
+    QTest::newRow("rich text4") << QString("<b>rich text</b>") << (int)Qt::LinksAccessibleByKeyboard << (int)Qt::StrongFocus << false;
+
+    if (!test_box)
+        test_box = new Widget;
+    if (!test_label)
+        test_label = new QLabel(test_box);
+}
+
+void tst_QLabel::eventPropagation()
+{
+    QFETCH(QString, text);
+    QFETCH(int, textInteractionFlags);
+    QFETCH(int, focusPolicy);
+    QFETCH(bool, propagation);
+
+    // plain text (accepts mouse event _only_ when label selectable by mouse)
+    test_label->setText(text);
+    test_box->events.clear();
+    test_label->setTextInteractionFlags(Qt::TextInteractionFlags(textInteractionFlags));
+    QVERIFY(int(test_label->focusPolicy()) == focusPolicy);
+    QTest::mousePress(test_label, Qt::LeftButton);
+    QVERIFY(test_box->events.contains(QEvent::MouseButtonPress) == propagation); // should have propagated!
+}
+
+void tst_QLabel::focusPolicy()
+{
+    delete test_label;
+    test_label = new QLabel;
+    QCOMPARE(test_label->focusPolicy(), Qt::NoFocus); // default
+    test_label->setFocusPolicy(Qt::StrongFocus);
+    test_label->setText("Whatever"); // setting text should not change the focus policy
+    QCOMPARE(test_label->focusPolicy(), Qt::StrongFocus);
+    test_label->setTextInteractionFlags(Qt::TextSelectableByKeyboard); // this should
+    QCOMPARE(test_label->focusPolicy(), Qt::ClickFocus);
+    test_label->setFocusPolicy(Qt::StrongFocus);
+    test_label->setText("Whatever"); // setting text should not change the focus policy
+    QCOMPARE(test_label->focusPolicy(), Qt::StrongFocus);
+    test_label->setTextInteractionFlags(Qt::NoTextInteraction);
+    QCOMPARE(test_label->focusPolicy(), Qt::NoFocus);
+    test_label->setFocusPolicy(Qt::StrongFocus);
+    test_label->setTextInteractionFlags(Qt::NoTextInteraction);
+    QCOMPARE(test_label->focusPolicy(), Qt::StrongFocus); // is not touched since value didn't change
+    delete test_label;
+}
+
+void tst_QLabel::task190318_sizes()
+{
+    QLabel label(" ");
+    QSize ms(500,600);
+    label.setMinimumSize(ms);
+    QCOMPARE(label.minimumSize(), ms);
+    QCOMPARE(label.sizeHint(), ms);
+    QCOMPARE(label.minimumSizeHint(), ms);
+}
+
+void tst_QLabel::sizeHint()
+{
+    QLabel label(QLatin1String("Test"));
+    label.setIndent(0);
+    label.setMargin(0);
+    label.setContentsMargins(0, 0, 0, 0);
+    label.setAlignment(Qt::AlignVCenter);
+    int h = label.sizeHint().height();
+
+    QLabel l1(QLatin1String("Test"));
+    l1.setIndent(0);
+    l1.setMargin(0);
+    l1.setContentsMargins(0, 0, 0, 0);
+    l1.setAlignment(Qt::AlignVCenter);
+    l1.setTextInteractionFlags(Qt::TextSelectableByMouse);   // will now use qtextcontrol
+    int h1 = l1.sizeHint().height();
+    QCOMPARE(h1, h);
+
+}
+
+void tst_QLabel::task226479_movieResize()
+{
+    class Label : public QLabel {
+        protected:
+            void paintEvent(QPaintEvent *e)
+            {
+                paintedRegion += e->region();
+                QLabel::paintEvent(e);
+            }
+            
+        public:
+            QRegion paintedRegion;
+    };
+    
+    Label label;
+    label.resize(350,350);
+    label.show();
+    QMovie *movie = new QMovie( &label );
+    label.setMovie(movie);
+    movie->setFileName(SRCDIR "red.png");
+    movie->start();
+    QTest::qWait(50);
+    movie->stop();
+    label.paintedRegion = QRegion();
+    movie->setFileName(SRCDIR "green.png");
+    movie->start();
+    QTest::qWait(50);
+    
+    QCOMPARE(label.paintedRegion , QRegion(label.rect()) );
+}
+
+void tst_QLabel::emptyPixmap()
+{
+    //task 197919
+    QLabel label1, label2, label3, label4;
+    label2.setPixmap(QPixmap("/tmp/idonotexist"));
+    QMovie movie;
+    label3.setMovie(&movie);
+    label4.setPicture(QPicture());
+    QCOMPARE(label1.sizeHint(), label2.sizeHint());
+    QCOMPARE(label1.sizeHint(), label3.sizeHint());
+    QCOMPARE(label1.sizeHint(), label4.sizeHint());
+}
+
+QTEST_MAIN(tst_QLabel)
+#include "tst_qlabel.moc"