diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-27 12:05:57 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-27 12:05:57 (GMT) |
| commit | d7666889000a80d88eb56c44d7ed83c8957fc767 (patch) | |
| tree | 47a8195649520d45f75c0497021ad35841e6d073 /doc/src/images | |
| parent | 29a6377c6539840ca901bdcb045a42b7832ac98a (diff) | |
| parent | 4519cfcf6dc4915f015e9b5f2d72ac35d0cee0bf (diff) | |
| download | Qt-d7666889000a80d88eb56c44d7ed83c8957fc767.zip Qt-d7666889000a80d88eb56c44d7ed83c8957fc767.tar.gz Qt-d7666889000a80d88eb56c44d7ed83c8957fc767.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix QT_NO_DATESTRING
Check the gesturemanager pointer before accessing it.
Added files that had been renamed.
Modified file/directory names and text to remove disallowed terminology.
Cherry pick fix for MOBILITY-1077 from Qt Mobility.
Fix typo in docs.
Cherry pick fix for MOBILITY-1145 from Qt Mobility.
Cherry pick fix for MOBILITY-1144 from Qt Mobility.
Fixed the following sub-tasks for QTBUG-12192
Diffstat (limited to 'doc/src/images')
| -rw-r--r-- | doc/src/images/touch-dials-example.png (renamed from doc/src/images/multitouch-dials-example.png) | bin | 17676 -> 17676 bytes |
| -rw-r--r-- | doc/src/images/touch-examples.png (renamed from doc/src/images/multitouch-examples.png) | bin | 6691 -> 6691 bytes |
| -rw-r--r-- | doc/src/images/touch-fingerpaint-example.png (renamed from doc/src/images/multitouch-fingerpaint-example.png) | bin | 17026 -> 17026 bytes |
| -rw-r--r-- | doc/src/images/touch-knobs-example.png (renamed from doc/src/images/multitouch-knobs-example.png) | bin | 1290 -> 1290 bytes |
| -rw-r--r-- | doc/src/images/touch-pinchzoom-example.png (renamed from doc/src/images/multitouch-pinchzoom-example.png) | bin | 48154 -> 48154 bytes |
5 files changed, 0 insertions, 0 deletions
diff --git a/doc/src/images/multitouch-dials-example.png b/doc/src/images/touch-dials-example.png Binary files differindex 60e1776..60e1776 100644 --- a/doc/src/images/multitouch-dials-example.png +++ b/doc/src/images/touch-dials-example.png diff --git a/doc/src/images/multitouch-examples.png b/doc/src/images/touch-examples.png Binary files differindex b053cf3..b053cf3 100644 --- a/doc/src/images/multitouch-examples.png +++ b/doc/src/images/touch-examples.png diff --git a/doc/src/images/multitouch-fingerpaint-example.png b/doc/src/images/touch-fingerpaint-example.png Binary files differindex c741b65..c741b65 100644 --- a/doc/src/images/multitouch-fingerpaint-example.png +++ b/doc/src/images/touch-fingerpaint-example.png diff --git a/doc/src/images/multitouch-knobs-example.png b/doc/src/images/touch-knobs-example.png Binary files differindex 1cbd90d..1cbd90d 100644 --- a/doc/src/images/multitouch-knobs-example.png +++ b/doc/src/images/touch-knobs-example.png diff --git a/doc/src/images/multitouch-pinchzoom-example.png b/doc/src/images/touch-pinchzoom-example.png Binary files differindex 1079fb2..1079fb2 100644 --- a/doc/src/images/multitouch-pinchzoom-example.png +++ b/doc/src/images/touch-pinchzoom-example.png |
