diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
| commit | b62bd0584a7872b6917917009b707785b3abd077 (patch) | |
| tree | 9981f274712c098cabbff0c4667672a3934e5393 /tests/auto/gui/image/qpixmap/images | |
| parent | 5e10745dca1d10025404a9f268f03ae697fb10cc (diff) | |
| parent | 97baad65f65783d2b5ff938f6217aec9434f2e5f (diff) | |
Merge branch 'refactor'
Conflicts:
mkspecs/qws/linux-lsb-g++/qmake.conf
src/gui/image/qpixmap_mac.cpp
src/gui/painting/qpaintengine_x11.cpp
src/gui/painting/qtessellator.cpp
src/gui/text/qfontengine_qws.cpp
src/gui/text/qfontengine_x11.cpp
src/gui/widgets/qlinecontrol.cpp
src/opengl/qgl.h
src/opengl/qgl_x11egl.cpp
src/plugins/plugins.pro
Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310
Diffstat (limited to 'tests/auto/gui/image/qpixmap/images')
25 files changed, 0 insertions, 0 deletions
diff --git a/tests/auto/gui/image/qpixmap/images/designer.png b/tests/auto/gui/image/qpixmap/images/designer.png Binary files differnew file mode 100644 index 0000000000..bca471d576 --- /dev/null +++ b/tests/auto/gui/image/qpixmap/images/designer.png diff --git a/tests/auto/gui/image/qpixmap/images/dx_-10_dy_-10_50_50_100_100.png b/tests/auto/gui/image/qpixmap/images/dx_-10_dy_-10_50_50_100_100.png Binary files differnew file mode 100644 index 0000000000..a4a19249c7 --- /dev/null +++ b/tests/auto/gui/image/qpixmap/images/dx_-10_dy_-10_50_50_100_100.png diff --git a/tests/auto/gui/image/qpixmap/images/dx_-10_dy_-10_x_y_w_h.png b/tests/auto/gui/image/qpixmap/images/dx_-10_dy_-10_x_y_w_h.png Binary files differnew file mode 100644 index 0000000000..1506af5a7e --- /dev/null +++ b/tests/auto/gui/image/qpixmap/images/dx_-10_dy_-10_x_y_w_h.png diff --git a/tests/auto/gui/image/qpixmap/images/dx_-10_dy_0_50_50_100_100.png b/tests/auto/gui/image/qpixmap/images/dx_-10_dy_0_50_50_100_100.png Binary files differnew file mode 100644 index 0000000000..8500ab1f5c --- /dev/null +++ b/tests/auto/gui/image/qpixmap/images/dx_-10_dy_0_50_50_100_100.png diff --git a/tests/auto/gui/image/qpixmap/images/dx_-10_dy_0_x_y_w_h.png b/tests/auto/gui/image/qpixmap/images/dx_-10_dy_0_x_y_w_h.png Binary files differnew file mode 100644 index 0000000000..2145c6124c --- /dev/null +++ b/tests/auto/gui/image/qpixmap/images/dx_-10_dy_0_x_y_w_h.png diff --git a/tests/auto/gui/image/qpixmap/images/dx_-128_dy_-128_x_y_w_h.png b/tests/auto/gui/image/qpixmap/images/dx_-128_dy_-128_x_y_w_h.png Binary files differnew file mode 100644 index 0000000000..bca471d576 --- /dev/null +++ b/tests/auto/gui/image/qpixmap/images/dx_-128_dy_-128_x_y_w_h.png diff --git a/tests/auto/gui/image/qpixmap/images/dx_-128_dy_0_x_y_w_h.png b/tests/auto/gui/image/qpixmap/images/dx_-128_dy_0_x_y_w_h.png Binary files differnew file mode 100644 index 0000000000..bca471d576 --- /dev/null +++ b/tests/auto/gui/image/qpixmap/images/dx_-128_dy_0_x_y_w_h.png diff --git a/tests/auto/gui/image/qpixmap/images/dx_0_dy_-10_50_50_100_100.png b/tests/auto/gui/image/qpixmap/images/dx_0_dy_-10_50_50_100_100.png Binary files differnew file mode 100644 index 0000000000..728ee79153 --- /dev/null +++ b/tests/auto/gui/image/qpixmap/images/dx_0_dy_-10_50_50_100_100.png diff --git a/tests/auto/gui/image/qpixmap/images/dx_0_dy_-10_x_y_w_h.png b/tests/auto/gui/image/qpixmap/images/dx_0_dy_-10_x_y_w_h.png Binary files differnew file mode 100644 index 0000000000..e9d5850db7 --- /dev/null +++ b/tests/auto/gui/image/qpixmap/images/dx_0_dy_-10_x_y_w_h.png diff --git a/tests/auto/gui/image/qpixmap/images/dx_0_dy_-128_x_y_w_h.png b/tests/auto/gui/image/qpixmap/images/dx_0_dy_-128_x_y_w_h.png Binary files differnew file mode 100644 index 0000000000..bca471d576 --- /dev/null +++ b/tests/auto/gui/image/qpixmap/images/dx_0_dy_-128_x_y_w_h.png diff --git a/tests/auto/gui/image/qpixmap/images/dx_0_dy_0_50_50_100_100.png b/tests/auto/gui/image/qpixmap/images/dx_0_dy_0_50_50_100_100.png Binary files differnew file mode 100644 index 0000000000..bca471d576 --- /dev/null +++ b/tests/auto/gui/image/qpixmap/images/dx_0_dy_0_50_50_100_100.png diff --git a/tests/auto/gui/image/qpixmap/images/dx_0_dy_0_null.png b/tests/auto/gui/image/qpixmap/images/dx_0_dy_0_null.png Binary files differnew file mode 100644 index 0000000000..bca471d576 --- /dev/null +++ b/tests/auto/gui/image/qpixmap/images/dx_0_dy_0_null.png diff --git a/tests/auto/gui/image/qpixmap/images/dx_0_dy_0_x_y_w_h.png b/tests/auto/gui/image/qpixmap/images/dx_0_dy_0_x_y_w_h.png Binary files differnew file mode 100644 index 0000000000..bca471d576 --- /dev/null +++ b/tests/auto/gui/image/qpixmap/images/dx_0_dy_0_x_y_w_h.png diff --git a/tests/auto/gui/image/qpixmap/images/dx_0_dy_10_50_50_100_100.png b/tests/auto/gui/image/qpixmap/images/dx_0_dy_10_50_50_100_100.png Binary files differnew file mode 100644 index 0000000000..7c09b17830 --- /dev/null +++ b/tests/auto/gui/image/qpixmap/images/dx_0_dy_10_50_50_100_100.png diff --git a/tests/auto/gui/image/qpixmap/images/dx_0_dy_10_x_y_w_h.png b/tests/auto/gui/image/qpixmap/images/dx_0_dy_10_x_y_w_h.png Binary files differnew file mode 100644 index 0000000000..70a63405e6 --- /dev/null +++ b/tests/auto/gui/image/qpixmap/images/dx_0_dy_10_x_y_w_h.png diff --git a/tests/auto/gui/image/qpixmap/images/dx_0_dy_128_x_y_w_h.png b/tests/auto/gui/image/qpixmap/images/dx_0_dy_128_x_y_w_h.png Binary files differnew file mode 100644 index 0000000000..bca471d576 --- /dev/null +++ b/tests/auto/gui/image/qpixmap/images/dx_0_dy_128_x_y_w_h.png diff --git a/tests/auto/gui/image/qpixmap/images/dx_0_dy_1_null.png b/tests/auto/gui/image/qpixmap/images/dx_0_dy_1_null.png Binary files differnew file mode 100644 index 0000000000..bca471d576 --- /dev/null +++ b/tests/auto/gui/image/qpixmap/images/dx_0_dy_1_null.png diff --git a/tests/auto/gui/image/qpixmap/images/dx_10_dy_0_50_50_100_100.png b/tests/auto/gui/image/qpixmap/images/dx_10_dy_0_50_50_100_100.png Binary files differnew file mode 100644 index 0000000000..85abadaf98 --- /dev/null +++ b/tests/auto/gui/image/qpixmap/images/dx_10_dy_0_50_50_100_100.png diff --git a/tests/auto/gui/image/qpixmap/images/dx_10_dy_0_x_y_w_h.png b/tests/auto/gui/image/qpixmap/images/dx_10_dy_0_x_y_w_h.png Binary files differnew file mode 100644 index 0000000000..3e03450c01 --- /dev/null +++ b/tests/auto/gui/image/qpixmap/images/dx_10_dy_0_x_y_w_h.png diff --git a/tests/auto/gui/image/qpixmap/images/dx_10_dy_10_50_50_100_100.png b/tests/auto/gui/image/qpixmap/images/dx_10_dy_10_50_50_100_100.png Binary files differnew file mode 100644 index 0000000000..315fbe087a --- /dev/null +++ b/tests/auto/gui/image/qpixmap/images/dx_10_dy_10_50_50_100_100.png diff --git a/tests/auto/gui/image/qpixmap/images/dx_10_dy_10_x_y_w_h.png b/tests/auto/gui/image/qpixmap/images/dx_10_dy_10_x_y_w_h.png Binary files differnew file mode 100644 index 0000000000..d91dc71217 --- /dev/null +++ b/tests/auto/gui/image/qpixmap/images/dx_10_dy_10_x_y_w_h.png diff --git a/tests/auto/gui/image/qpixmap/images/dx_128_dy_0_x_y_w_h.png b/tests/auto/gui/image/qpixmap/images/dx_128_dy_0_x_y_w_h.png Binary files differnew file mode 100644 index 0000000000..bca471d576 --- /dev/null +++ b/tests/auto/gui/image/qpixmap/images/dx_128_dy_0_x_y_w_h.png diff --git a/tests/auto/gui/image/qpixmap/images/dx_128_dy_128_64_64_128_128.png b/tests/auto/gui/image/qpixmap/images/dx_128_dy_128_64_64_128_128.png Binary files differnew file mode 100644 index 0000000000..bca471d576 --- /dev/null +++ b/tests/auto/gui/image/qpixmap/images/dx_128_dy_128_64_64_128_128.png diff --git a/tests/auto/gui/image/qpixmap/images/dx_128_dy_128_x_y_w_h.png b/tests/auto/gui/image/qpixmap/images/dx_128_dy_128_x_y_w_h.png Binary files differnew file mode 100644 index 0000000000..bca471d576 --- /dev/null +++ b/tests/auto/gui/image/qpixmap/images/dx_128_dy_128_x_y_w_h.png diff --git a/tests/auto/gui/image/qpixmap/images/dx_1_dy_0_null.png b/tests/auto/gui/image/qpixmap/images/dx_1_dy_0_null.png Binary files differnew file mode 100644 index 0000000000..bca471d576 --- /dev/null +++ b/tests/auto/gui/image/qpixmap/images/dx_1_dy_0_null.png |
