summaryrefslogtreecommitdiffstats
path: root/src/scripttools/debugging/qscriptdebuggeragent.cpp
diff options
context:
space:
mode:
authorThierry Bastian <thierry.bastian@nokia.com>2010-11-16 00:00:11 (GMT)
committerThierry Bastian <thierry.bastian@nokia.com>2010-11-16 00:00:11 (GMT)
commit70e9090b13f828b048caadf305d405bdf9098d70 (patch)
treeee41264c5c0766786313261049a3fa5c70578906 /src/scripttools/debugging/qscriptdebuggeragent.cpp
parent2e36c20f3039b94b02b49567edf4470fe73cceb8 (diff)
parentb36e357b982ba01cbf905fb1d0340e87030b0a95 (diff)
downloadQt-70e9090b13f828b048caadf305d405bdf9098d70.zip
Qt-70e9090b13f828b048caadf305d405bdf9098d70.tar.gz
Qt-70e9090b13f828b048caadf305d405bdf9098d70.tar.bz2
Merge branch 'master-upstream' into master-water
Diffstat (limited to 'src/scripttools/debugging/qscriptdebuggeragent.cpp')
-rw-r--r--src/scripttools/debugging/qscriptdebuggeragent.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/scripttools/debugging/qscriptdebuggeragent.cpp b/src/scripttools/debugging/qscriptdebuggeragent.cpp
index 551f6c3..9362639 100644
--- a/src/scripttools/debugging/qscriptdebuggeragent.cpp
+++ b/src/scripttools/debugging/qscriptdebuggeragent.cpp
@@ -116,7 +116,7 @@ QScriptDebuggerAgent::~QScriptDebuggerAgent()
/*!
Instructs the agent to perform a "step into" operation. This
function returns immediately. The agent will report step completion
- at a later time, i.e. when script statements are evaluted.
+ at a later time, i.e. when script statements are evaluated.
*/
void QScriptDebuggerAgent::enterStepIntoMode(int count)
{
@@ -129,7 +129,7 @@ void QScriptDebuggerAgent::enterStepIntoMode(int count)
/*!
Instructs the agent to perform a "step over" operation. This
function returns immediately. The agent will report step completion
- at a later time, i.e. when script statements are evaluted.
+ at a later time, i.e. when script statements are evaluated.
*/
void QScriptDebuggerAgent::enterStepOverMode(int count)
{
@@ -146,7 +146,7 @@ void QScriptDebuggerAgent::enterStepOverMode(int count)
/*!
Instructs the agent to perform a "step out" operation. This
function returns immediately. The agent will report step completion
- at a later time, i.e. when script statements are evaluted.
+ at a later time, i.e. when script statements are evaluated.
*/
void QScriptDebuggerAgent::enterStepOutMode()
{