diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-06-18 13:10:26 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-06-18 13:10:26 +0200 |
| commit | a3fd00796dafe52d4ff138b271564daf70d1adee (patch) | |
| tree | 77ca481c06c1b2c3c7822a4cd5864702e341b680 /tools/qdoc3/test/images | |
| parent | 793d1ed8d3a03eefdd487facdacf66ba575e1a07 (diff) | |
| parent | 6aa50af000f85cc4497749fcf0860c8ed244a60e (diff) | |
| download | qt4-tools-a3fd00796dafe52d4ff138b271564daf70d1adee.tar.gz | |
Merge remote branch 'qt/4.7' into lighthouse
Conflicts:
configure
mkspecs/common/qws.conf
src/corelib/io/qresource.cpp
src/gui/image/qpixmapdata_p.h
src/gui/kernel/qapplication.cpp
src/gui/kernel/qapplication_p.h
src/gui/painting/qpaintengine_raster.cpp
src/gui/text/qfontdatabase.cpp
src/opengl/qgl_p.h
src/plugins/mediaservices/gstreamer/gstreamer.pro
Diffstat (limited to 'tools/qdoc3/test/images')
| -rw-r--r-- | tools/qdoc3/test/images/bg_l.png | bin | 0 -> 100 bytes |
| -rw-r--r-- | tools/qdoc3/test/images/bg_l_blank.png | bin | 0 -> 84 bytes |
| -rw-r--r-- | tools/qdoc3/test/images/bg_r.png | bin | 0 -> 96 bytes |
| -rw-r--r-- | tools/qdoc3/test/images/box_bg.png | bin | 0 -> 89 bytes |
| -rw-r--r-- | tools/qdoc3/test/images/breadcrumb.png | bin | 0 -> 134 bytes |
| -rw-r--r-- | tools/qdoc3/test/images/bullet_dn.png | bin | 0 -> 230 bytes |
| -rw-r--r-- | tools/qdoc3/test/images/bullet_gt.png | bin | 0 -> 124 bytes |
| -rw-r--r-- | tools/qdoc3/test/images/bullet_sq.png | bin | 0 -> 74 bytes |
| -rw-r--r-- | tools/qdoc3/test/images/bullet_up.png | bin | 0 -> 253 bytes |
| -rw-r--r-- | tools/qdoc3/test/images/feedbackground.png | bin | 0 -> 263 bytes |
| -rw-r--r-- | tools/qdoc3/test/images/horBar.png | bin | 0 -> 2807 bytes |
| -rw-r--r-- | tools/qdoc3/test/images/page.png | bin | 0 -> 3102 bytes |
| -rw-r--r-- | tools/qdoc3/test/images/page_bg.png | bin | 0 -> 84 bytes |
| -rw-r--r-- | tools/qdoc3/test/images/sprites-combined.png | bin | 0 -> 62534 bytes |
14 files changed, 0 insertions, 0 deletions
diff --git a/tools/qdoc3/test/images/bg_l.png b/tools/qdoc3/test/images/bg_l.png Binary files differnew file mode 100644 index 0000000000..90b1da10b9 --- /dev/null +++ b/tools/qdoc3/test/images/bg_l.png diff --git a/tools/qdoc3/test/images/bg_l_blank.png b/tools/qdoc3/test/images/bg_l_blank.png Binary files differnew file mode 100644 index 0000000000..5a9673d81b --- /dev/null +++ b/tools/qdoc3/test/images/bg_l_blank.png diff --git a/tools/qdoc3/test/images/bg_r.png b/tools/qdoc3/test/images/bg_r.png Binary files differnew file mode 100644 index 0000000000..f0fb121dea --- /dev/null +++ b/tools/qdoc3/test/images/bg_r.png diff --git a/tools/qdoc3/test/images/box_bg.png b/tools/qdoc3/test/images/box_bg.png Binary files differnew file mode 100644 index 0000000000..3322f923f8 --- /dev/null +++ b/tools/qdoc3/test/images/box_bg.png diff --git a/tools/qdoc3/test/images/breadcrumb.png b/tools/qdoc3/test/images/breadcrumb.png Binary files differnew file mode 100644 index 0000000000..0ded5514d2 --- /dev/null +++ b/tools/qdoc3/test/images/breadcrumb.png diff --git a/tools/qdoc3/test/images/bullet_dn.png b/tools/qdoc3/test/images/bullet_dn.png Binary files differnew file mode 100644 index 0000000000..f7762472e2 --- /dev/null +++ b/tools/qdoc3/test/images/bullet_dn.png diff --git a/tools/qdoc3/test/images/bullet_gt.png b/tools/qdoc3/test/images/bullet_gt.png Binary files differnew file mode 100644 index 0000000000..7561b4edc4 --- /dev/null +++ b/tools/qdoc3/test/images/bullet_gt.png diff --git a/tools/qdoc3/test/images/bullet_sq.png b/tools/qdoc3/test/images/bullet_sq.png Binary files differnew file mode 100644 index 0000000000..a84845e3c7 --- /dev/null +++ b/tools/qdoc3/test/images/bullet_sq.png diff --git a/tools/qdoc3/test/images/bullet_up.png b/tools/qdoc3/test/images/bullet_up.png Binary files differnew file mode 100644 index 0000000000..285e7411b4 --- /dev/null +++ b/tools/qdoc3/test/images/bullet_up.png diff --git a/tools/qdoc3/test/images/feedbackground.png b/tools/qdoc3/test/images/feedbackground.png Binary files differnew file mode 100644 index 0000000000..3a38d995d7 --- /dev/null +++ b/tools/qdoc3/test/images/feedbackground.png diff --git a/tools/qdoc3/test/images/horBar.png b/tools/qdoc3/test/images/horBar.png Binary files differnew file mode 100644 index 0000000000..100fe91c6c --- /dev/null +++ b/tools/qdoc3/test/images/horBar.png diff --git a/tools/qdoc3/test/images/page.png b/tools/qdoc3/test/images/page.png Binary files differnew file mode 100644 index 0000000000..1db151bd31 --- /dev/null +++ b/tools/qdoc3/test/images/page.png diff --git a/tools/qdoc3/test/images/page_bg.png b/tools/qdoc3/test/images/page_bg.png Binary files differnew file mode 100644 index 0000000000..9b3bd999df --- /dev/null +++ b/tools/qdoc3/test/images/page_bg.png diff --git a/tools/qdoc3/test/images/sprites-combined.png b/tools/qdoc3/test/images/sprites-combined.png Binary files differnew file mode 100644 index 0000000000..3a48b21f6b --- /dev/null +++ b/tools/qdoc3/test/images/sprites-combined.png |
