diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-08-09 08:26:47 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-08-09 08:26:47 (GMT) |
| commit | cfe96b7c99cb12a666111c7861aba74d535adc89 (patch) | |
| tree | eda2c872b4446b8b4796162ea46c86a4ba171cc9 /doc/src/images/qml-texteditor3_textarea.png | |
| parent | 86eec3f6f98b387bf6a815c1a8e916965928b317 (diff) | |
| parent | 1d09376c4eec88ba94f00a4b045fc425c5f51346 (diff) | |
| download | Qt-cfe96b7c99cb12a666111c7861aba74d535adc89.zip Qt-cfe96b7c99cb12a666111c7861aba74d535adc89.tar.gz Qt-cfe96b7c99cb12a666111c7861aba74d535adc89.tar.bz2 | |
Merge remote branch 'origin/4.7' into oslo-staging-2/4.7
Conflicts:
doc/src/index.qdoc
src/dbus/qdbusconnection.cpp
src/gui/s60framework/qs60mainapplication.cpp
src/gui/s60framework/qs60mainappui.cpp
src/network/access/qnetworkrequest.cpp
src/network/bearer/qnetworkconfiguration.h
Diffstat (limited to 'doc/src/images/qml-texteditor3_textarea.png')
| -rw-r--r-- | doc/src/images/qml-texteditor3_textarea.png | bin | 0 -> 10417 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/doc/src/images/qml-texteditor3_textarea.png b/doc/src/images/qml-texteditor3_textarea.png Binary files differnew file mode 100644 index 0000000..95abcd6 --- /dev/null +++ b/doc/src/images/qml-texteditor3_textarea.png |