diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-02-10 10:57:05 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-02-10 11:23:31 (GMT) |
| commit | 72e0778c9b5bdae58596090b114d5d0e7092f911 (patch) | |
| tree | 53c31d9b61700c2c6db672767e24953192c5373c /doc/src/images | |
| parent | abb425e3db6c20c5271788cb1ec4e1fe37b9ea5b (diff) | |
| parent | 50bb35a5ca48816f7563d1055071b4caa7791056 (diff) | |
| download | Qt-72e0778c9b5bdae58596090b114d5d0e7092f911.zip Qt-72e0778c9b5bdae58596090b114d5d0e7092f911.tar.gz Qt-72e0778c9b5bdae58596090b114d5d0e7092f911.tar.bz2 | |
Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
doc/src/development/qmake-manual.qdoc
mkspecs/symbian-gcce/qmake.conf
qmake/project.cpp
src/corelib/global/qnamespace.qdoc
src/declarative/graphicsitems/qdeclarativetext.cpp
src/gui/text/qtextdocumentlayout.cpp
src/gui/text/qtextdocumentlayout_p.h
tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
tests/auto/networkselftest/networkselftest.pro
tests/auto/qscriptengine/tst_qscriptengine.cpp
tools/designer/src/components/signalsloteditor/signalslot_utils.cpp
tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt-html-templates.qdocconf
tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf
tools/qdoc3/test/qt.qdocconf
tools/qdoc3/test/qt_ja_JP.qdocconf
tools/qdoc3/test/qt_zh_CN.qdocconf
Diffstat (limited to 'doc/src/images')
| -rwxr-xr-x | doc/src/images/audiodevices-example.png | bin | 0 -> 25856 bytes |
| -rw-r--r-- | doc/src/images/audioinput-example.png | bin | 0 -> 10383 bytes |
| -rwxr-xr-x | doc/src/images/audiooutput-example.png | bin | 0 -> 11966 bytes |
| -rw-r--r-- | doc/src/images/combowidgetmapper-example.png (renamed from doc/src/images/combo-widget-mapper.png) | bin | 10801 -> 10801 bytes |
| -rw-r--r-- | doc/src/images/declarative-colors.png | bin | 0 -> 4993 bytes |
| -rwxr-xr-x | doc/src/images/modelview-combobox.png (renamed from doc/src/images/combobox.png) | bin | 5022 -> 5022 bytes |
| -rwxr-xr-x | doc/src/images/modelview-header.png (renamed from doc/src/images/header.png) | bin | 30302 -> 30302 bytes |
| -rw-r--r-- | doc/src/images/qmediaplayer-demo.png (renamed from doc/src/images/mediaplayer-demo.png) | bin | 12868 -> 12868 bytes |
8 files changed, 0 insertions, 0 deletions
diff --git a/doc/src/images/audiodevices-example.png b/doc/src/images/audiodevices-example.png Binary files differnew file mode 100755 index 0000000..ae857df --- /dev/null +++ b/doc/src/images/audiodevices-example.png diff --git a/doc/src/images/audioinput-example.png b/doc/src/images/audioinput-example.png Binary files differnew file mode 100644 index 0000000..fb703e6 --- /dev/null +++ b/doc/src/images/audioinput-example.png diff --git a/doc/src/images/audiooutput-example.png b/doc/src/images/audiooutput-example.png Binary files differnew file mode 100755 index 0000000..5588fbb --- /dev/null +++ b/doc/src/images/audiooutput-example.png diff --git a/doc/src/images/combo-widget-mapper.png b/doc/src/images/combowidgetmapper-example.png Binary files differindex 910d6ed..910d6ed 100644 --- a/doc/src/images/combo-widget-mapper.png +++ b/doc/src/images/combowidgetmapper-example.png diff --git a/doc/src/images/declarative-colors.png b/doc/src/images/declarative-colors.png Binary files differnew file mode 100644 index 0000000..f2eacd8 --- /dev/null +++ b/doc/src/images/declarative-colors.png diff --git a/doc/src/images/combobox.png b/doc/src/images/modelview-combobox.png Binary files differindex d172b41..d172b41 100755 --- a/doc/src/images/combobox.png +++ b/doc/src/images/modelview-combobox.png diff --git a/doc/src/images/header.png b/doc/src/images/modelview-header.png Binary files differindex 2597635..2597635 100755 --- a/doc/src/images/header.png +++ b/doc/src/images/modelview-header.png diff --git a/doc/src/images/mediaplayer-demo.png b/doc/src/images/qmediaplayer-demo.png Binary files differindex 2c1f9b4..2c1f9b4 100644 --- a/doc/src/images/mediaplayer-demo.png +++ b/doc/src/images/qmediaplayer-demo.png |
