Merge branch 'docs'

Conflicts: doc/qtcreator.qdoc
2010-03-12 18:33:46 +01:00
parent 14fc6e93ed 16f7ed26df
commit bd16eeef9d
46 changed files with 1149 additions and 582 deletions
--- 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
--- a/doc/images/qtcreator-add-resource-wizard2.png
+++ b/doc/images/qtcreator-add-resource-wizard2.png
--- a/doc/images/qtcreator-add-resource-wizard3.png
+++ b/doc/images/qtcreator-add-resource-wizard3.png
--- a/doc/images/qtcreator-add-resource.png
+++ b/doc/images/qtcreator-add-resource.png
--- a/doc/images/qtcreator-class-info.png
+++ b/doc/images/qtcreator-class-info.png
--- a/doc/images/qtcreator-cmake-import-wizard1.png
+++ b/doc/images/qtcreator-cmake-import-wizard1.png
--- a/doc/images/qtcreator-cmake-import-wizard2.png
+++ b/doc/images/qtcreator-cmake-import-wizard2.png
--- a/doc/images/qtcreator-cmakeexecutable.png
+++ b/doc/images/qtcreator-cmakeexecutable.png
--- a/doc/images/qtcreator-formedit.png
+++ b/doc/images/qtcreator-formedit.png
--- a/doc/images/qtcreator-intro-and-location.png
+++ b/doc/images/qtcreator-intro-and-location.png
--- a/doc/images/qtcreator-new-project-qt-versions.png
+++ b/doc/images/qtcreator-new-project-qt-versions.png
--- a/doc/images/qtcreator-new-project-summary.png
+++ b/doc/images/qtcreator-new-project-summary.png
--- a/doc/images/qtcreator-new-project.png
+++ b/doc/images/qtcreator-new-project.png
--- a/doc/images/qtcreator-run.png
+++ b/doc/images/qtcreator-run.png
--- a/doc/images/qtcreator-search-allprojects.png
+++ b/doc/images/qtcreator-search-allprojects.png
--- a/doc/images/qtcreator-serverbutton.png
+++ b/doc/images/qtcreator-serverbutton.png
--- a/doc/images/qtcreator-texfinder-ui-horizontal-layout.png
+++ b/doc/images/qtcreator-texfinder-ui-horizontal-layout.png
--- a/doc/images/qtcreator-texteditor-behavior.png
+++ b/doc/images/qtcreator-texteditor-behavior.png
--- a/doc/images/qtcreator-texteditor-completion.png
+++ b/doc/images/qtcreator-texteditor-completion.png
--- a/doc/images/qtcreator-texteditor-display.png
+++ b/doc/images/qtcreator-texteditor-display.png
--- a/doc/images/qtcreator-texteditor-fonts.png
+++ b/doc/images/qtcreator-texteditor-fonts.png
--- a/doc/images/qtcreator-textfinder-contents.png
+++ b/doc/images/qtcreator-textfinder-contents.png
--- a/doc/images/qtcreator-textfinder-screenshot.png
+++ b/doc/images/qtcreator-textfinder-screenshot.png
--- a/doc/images/qtcreator-textfinder-ui-widgets.png
+++ b/doc/images/qtcreator-textfinder-ui-widgets.png
--- a/doc/images/qtcreator-textfinder-ui.png
+++ b/doc/images/qtcreator-textfinder-ui.png
--- a/doc/qtcreator.qdoc
+++ b/doc/qtcreator.qdoc
--- a/doc/qtcreator.qdocconf
+++ b/doc/qtcreator.qdocconf
@@ -50,6 +50,8 @@ macro.ouml.HTML         = "&ouml;"
 macro.QA                = "\\e{Qt Assistant}"
 macro.QD                = "\\e{Qt Designer}"
 macro.QL                = "\\e{Qt Linguist}"
+macro.QC		= "\\e{Qt Creator}"
+macro.QMLD		= "\\e{QML Designer}"
 macro.param             = "\\e"
 macro.raisedaster.HTML  = "<sup>*</sup>"
 macro.reg.HTML          = "<sup>&reg;</sup>"