diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2012-09-21 16:05:58 +0200 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2012-09-21 16:26:19 +0200 |
commit | 9c2afc4f29345c625363cfc6b474bd41e586a3fd (patch) | |
tree | 27c1b168f64c9f83898d264b233de11a1d86395c | |
parent | a8d0b04f49e9372846daa409e6e111dec49154f6 (diff) |
doc: Fix some spelling errors
Change-Id: I22c0de2d1c5277879fe504764c15a76d1d7f198b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
-rw-r--r-- | doc/api/coding-style.qdoc | 6 | ||||
-rw-r--r-- | doc/src/debugger/creator-debugger-setup.qdoc | 2 | ||||
-rw-r--r-- | doc/src/debugger/creator-debugger.qdoc | 2 | ||||
-rw-r--r-- | doc/src/editors/creator-editors.qdoc | 2 | ||||
-rw-r--r-- | doc/src/howto/creator-keyboard-shortcuts.qdoc | 4 | ||||
-rw-r--r-- | doc/src/howto/creator-vcs.qdoc | 2 | ||||
-rw-r--r-- | doc/src/howto/qtcreator-faq.qdoc | 2 | ||||
-rw-r--r-- | doc/src/projects/creator-projects-custom-wizards.qdoc | 2 | ||||
-rw-r--r-- | lib/qtcreator/qtcomponents/custom/ButtonColumn.qml | 2 | ||||
-rw-r--r-- | lib/qtcreator/qtcomponents/custom/ButtonRow.qml | 2 | ||||
-rw-r--r-- | lib/qtcreator/qtcomponents/custom/private/ChoiceListPopup.qml | 2 | ||||
-rw-r--r-- | share/qtcreator/welcomescreen/gettingstarted.qml | 4 | ||||
-rw-r--r-- | src/plugins/valgrind/valgrindconfigwidget.ui | 2 |
13 files changed, 17 insertions, 17 deletions
diff --git a/doc/api/coding-style.qdoc b/doc/api/coding-style.qdoc index 42d9c92df1..681f3e3a4d 100644 --- a/doc/api/coding-style.qdoc +++ b/doc/api/coding-style.qdoc @@ -435,7 +435,7 @@ \o Use \c{class} instead of \c{struct}. Some compilers mangle that difference into the symbol names and spit out warnings if a struct declaration is followed by a class definition. To avoid ongoing - changes from one to the other we declare \c{class} the prefered way. + changes from one to the other we declare \c{class} the preferred way. \endlist @@ -782,7 +782,7 @@ reentrant, though. \o A \c char is signed or unsigned dependent on the architecture. Use signed - \c char or \c uchar if you explicitely want a signed or unsigned char. + \c char or \c uchar if you explicitly want a signed or unsigned char. The following code will break on PowerPC, for example: \code @@ -848,7 +848,7 @@ \o No float comparisons (\c{-Wfloat-equal}). Use \c qFuzzyCompare to compare values with a delta. Use \c qIsNull to check whether a float is - binary 0, instead of comparing it to 0.0, or, prefered, move + binary 0, instead of comparing it to 0.0, or, preferred, move such code into an implementation file. \o Do not hide virtual methods in subclasses (\{-Woverloaded-virtual}). diff --git a/doc/src/debugger/creator-debugger-setup.qdoc b/doc/src/debugger/creator-debugger-setup.qdoc index ea369f2800..fd450effa2 100644 --- a/doc/src/debugger/creator-debugger-setup.qdoc +++ b/doc/src/debugger/creator-debugger-setup.qdoc @@ -102,7 +102,7 @@ \section2 Supported CDB Versions - The CDB native debugger has similar funtionality to the non-Python GDB + The CDB native debugger has similar functionality to the non-Python GDB debugger engine. Specifically, it also uses compiled C++ code for the debugging helper library. diff --git a/doc/src/debugger/creator-debugger.qdoc b/doc/src/debugger/creator-debugger.qdoc index 284608e9b3..c811a0a977 100644 --- a/doc/src/debugger/creator-debugger.qdoc +++ b/doc/src/debugger/creator-debugger.qdoc @@ -193,7 +193,7 @@ While this mode does not strictly require a project to be opened in \QC, it is beneficial to have open one, as it makes setting breakpoints - and stepping throught the code easier. + and stepping through the code easier. You can specify breakpoints before or after attaching the debugger to the application. diff --git a/doc/src/editors/creator-editors.qdoc b/doc/src/editors/creator-editors.qdoc index 264d56c629..9a48a28deb 100644 --- a/doc/src/editors/creator-editors.qdoc +++ b/doc/src/editors/creator-editors.qdoc @@ -1652,7 +1652,7 @@ \row \o Switch with Next/Previous Parameter \o Moves a parameter down or up one position in a parameter list. - \o Parameter in the declaration or definition of a fuction or method + \o Parameter in the declaration or definition of a function or method \row \o Extract Method \o Moves the selected code to a new method and replaces the block of diff --git a/doc/src/howto/creator-keyboard-shortcuts.qdoc b/doc/src/howto/creator-keyboard-shortcuts.qdoc index 3b5403f1f8..25c5b8277f 100644 --- a/doc/src/howto/creator-keyboard-shortcuts.qdoc +++ b/doc/src/howto/creator-keyboard-shortcuts.qdoc @@ -421,10 +421,10 @@ \o Find previous \o Shift+F3 \row - \o Find next occurence of selected text + \o Find next occurrence of selected text \o Ctrl+F3 \row - \o Find previous occurence of selected text + \o Find previous occurrence of selected text \o Ctrl+Shift+F3 \row \o Replace next diff --git a/doc/src/howto/creator-vcs.qdoc b/doc/src/howto/creator-vcs.qdoc index 3f371ae6b2..337a45ca77 100644 --- a/doc/src/howto/creator-vcs.qdoc +++ b/doc/src/howto/creator-vcs.qdoc @@ -245,7 +245,7 @@ \section3 Reverting Changes Using Git The Git version control system has an index that is used to stage - changes. The index is commited on the next commit. Git allows you to revert + changes. The index is committed on the next commit. Git allows you to revert back to the state of the last commit as well as to the state staged in the index. diff --git a/doc/src/howto/qtcreator-faq.qdoc b/doc/src/howto/qtcreator-faq.qdoc index bcb0fe5d45..c1ce45912e 100644 --- a/doc/src/howto/qtcreator-faq.qdoc +++ b/doc/src/howto/qtcreator-faq.qdoc @@ -197,7 +197,7 @@ sudo apt-get install libgl-dev libglu-dev \endcode - \section1 Platform Releated Questions + \section1 Platform Related Questions \bold {Where is application output shown in \QC?} diff --git a/doc/src/projects/creator-projects-custom-wizards.qdoc b/doc/src/projects/creator-projects-custom-wizards.qdoc index 90aa8ba8ce..aa29e9b7a3 100644 --- a/doc/src/projects/creator-projects-custom-wizards.qdoc +++ b/doc/src/projects/creator-projects-custom-wizards.qdoc @@ -509,7 +509,7 @@ \endcode By default, the scripts are run in the directory corresponding to - \c %TargetPath%. This can be overriden by specifying the attribute + \c %TargetPath%. This can be overridden by specifying the attribute \c workingdirectory on the element \c generatorscript. For example, if the script creates the project directory by itself, %Path% can be specified. In that case, \c --dry-run should output the correct relative paths or absolute diff --git a/lib/qtcreator/qtcomponents/custom/ButtonColumn.qml b/lib/qtcreator/qtcomponents/custom/ButtonColumn.qml index 59510a84a0..50908d6b52 100644 --- a/lib/qtcreator/qtcomponents/custom/ButtonColumn.qml +++ b/lib/qtcreator/qtcomponents/custom/ButtonColumn.qml @@ -53,7 +53,7 @@ Column { * [bool=true] Specifies the grouping behavior. If enabled, the checked property on buttons contained * in the group will be exclusive. * - * Note that a button in an exclusive group will allways be checkable + * Note that a button in an exclusive group will always be checkable */ property bool exclusive: true diff --git a/lib/qtcreator/qtcomponents/custom/ButtonRow.qml b/lib/qtcreator/qtcomponents/custom/ButtonRow.qml index 99aaf0e564..8398579828 100644 --- a/lib/qtcreator/qtcomponents/custom/ButtonRow.qml +++ b/lib/qtcreator/qtcomponents/custom/ButtonRow.qml @@ -53,7 +53,7 @@ Row { * [bool=true] Specifies the grouping behavior. If enabled, the checked property on buttons contained * in the group will be exclusive. * - * Note that a button in an exclusive group will allways be checkable + * Note that a button in an exclusive group will always be checkable */ property bool exclusive: true diff --git a/lib/qtcreator/qtcomponents/custom/private/ChoiceListPopup.qml b/lib/qtcreator/qtcomponents/custom/private/ChoiceListPopup.qml index 04019f459c..b96b550e28 100644 --- a/lib/qtcreator/qtcomponents/custom/private/ChoiceListPopup.qml +++ b/lib/qtcreator/qtcomponents/custom/private/ChoiceListPopup.qml @@ -37,7 +37,7 @@ MouseArea { // need to reparent it to the root item to fake it upon showing the popup. // In that case, the popup will also fill the whole window to allow the user to // close the popup by clicking anywhere in the window. Letting the popup act as the mouse - // area for the button that 'owns' it is also nessesary to support drag'n'release behavior. + // area for the button that 'owns' it is also necessary to support drag'n'release behavior. // The 'popupframe' delegate will be told to show or hide by assigning // opacity to 1 or 0, respectively. diff --git a/share/qtcreator/welcomescreen/gettingstarted.qml b/share/qtcreator/welcomescreen/gettingstarted.qml index 71d8c1c8c2..fbf27e051d 100644 --- a/share/qtcreator/welcomescreen/gettingstarted.qml +++ b/share/qtcreator/welcomescreen/gettingstarted.qml @@ -104,7 +104,7 @@ Rectangle { imageUrl: "widgets/images/gettingStarted01.png" title: qsTr("IDE Overview") - description: qsTr("To find out what kind of integrated enviroment (IDE) Qt Creator is.") + description: qsTr("To find out what kind of integrated environment (IDE) Qt Creator is.") number: 1 onClicked: gettingStarted.openHelp("qthelp://com.nokia.qtcreator/doc/creator-overview.html") @@ -114,7 +114,7 @@ Rectangle { x: 250 y: 83 - description: qsTr("To become familar with the parts of the Qt Creator user interface and to learn how to use them.") + description: qsTr("To become familiar with the parts of the Qt Creator user interface and to learn how to use them.") title: qsTr("User Interface") imageUrl: "widgets/images/gettingStarted02.png" number: 2 diff --git a/src/plugins/valgrind/valgrindconfigwidget.ui b/src/plugins/valgrind/valgrindconfigwidget.ui index f9b028c4f4..0b8bd1a07c 100644 --- a/src/plugins/valgrind/valgrindconfigwidget.ui +++ b/src/plugins/valgrind/valgrindconfigwidget.ui @@ -270,7 +270,7 @@ With cache simulation, further event counters are enabled: <string/> </property> <property name="text"> - <string>Visualisation: Minimum event cost:</string> + <string>Visualization: Minimum event cost:</string> </property> </widget> </item> |