Merge branch 'docs'

Conflicts: doc/qtcreator.qdoc

Merge branch 'docs'
Conflicts: doc/qtcreator.qdoc
bd16eeef · Oswald Buddenhagen · 14fc6e93 · 16f7ed26 · bd16eeef · 14fc6e93
Commit bd16eeef authored Mar 12, 2010 by Oswald Buddenhagen
--- a/doc/addressbook-sdk.qdoc
+++ b/doc/addressbook-sdk.qdoc
--- a/doc/images/addressbook-tutorial-part1-creator-screenshot.png
+++ b/doc/images/addressbook-tutorial-part1-creator-screenshot.png
--- a/doc/images/addressbook-tutorial-part1-designer-screenshot.png
+++ b/doc/images/addressbook-tutorial-part1-designer-screenshot.png
--- a/doc/images/addressbook-tutorial-part2-form-design.png
+++ b/doc/images/addressbook-tutorial-part2-form-design.png
--- a/doc/images/addressbook-tutorial-part4-confirm.png
+++ b/doc/images/addressbook-tutorial-part4-confirm.png
--- a/doc/images/addressbook-tutorial-part4-remove.png
+++ b/doc/images/addressbook-tutorial-part4-remove.png
--- a/doc/images/addressbook-tutorial-part4-screenshot.png
+++ b/doc/images/addressbook-tutorial-part4-screenshot.png
--- a/doc/images/addressbook-tutorial-part5-finddialog-in-designer.png
+++ b/doc/images/addressbook-tutorial-part5-finddialog-in-designer.png
--- a/doc/images/qmldesigner-anchor-fill-screen.png
+++ b/doc/images/qmldesigner-anchor-fill-screen.png
--- a/doc/images/qmldesigner-helloworld-base-state.png
+++ b/doc/images/qmldesigner-helloworld-base-state.png
--- a/doc/images/qmldesigner-helloworld-state1.png
+++ b/doc/images/qmldesigner-helloworld-state1.png
--- a/doc/images/qmldesigner-helloworld-widget-add.png
+++ b/doc/images/qmldesigner-helloworld-widget-add.png
--- a/doc/images/qmldesigner-helloworld-widget-edit.png
+++ b/doc/images/qmldesigner-helloworld-widget-edit.png
--- a/doc/images/qmldesigner-helloworld.png
+++ b/doc/images/qmldesigner-helloworld.png
--- a/doc/images/qmldesigner-new-project-contents.png
+++ b/doc/images/qmldesigner-new-project-contents.png
--- a/doc/images/qmldesigner-new-project-location.png
+++ b/doc/images/qmldesigner-new-project-location.png
--- a/doc/images/qmldesigner-new-project-summary.png
+++ b/doc/images/qmldesigner-new-project-summary.png
--- a/doc/images/qmldesigner-new-project.png
+++ b/doc/images/qmldesigner-new-project.png
--- a/doc/images/qmldesigner-visual-editor.png
+++ b/doc/images/qmldesigner-visual-editor.png
--- a/doc/images/qtcreator-add-resource-wizard.png
+++ b/doc/images/qtcreator-add-resource-wizard.png