diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-15 01:27:44 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-15 01:27:44 (GMT) |
| commit | b36e357b982ba01cbf905fb1d0340e87030b0a95 (patch) | |
| tree | 804b089514aa271ae1f6e8e598a6014a133e3460 /src/scripttools/debugging/qscriptdebuggeragent.cpp | |
| parent | 7b3880475d02bd3db630387bccccc7e1ef9d4e9a (diff) | |
| parent | d1674f5c630bbb86acf1fe11a0d7c18cb79b3908 (diff) | |
| download | Qt-b36e357b982ba01cbf905fb1d0340e87030b0a95.zip Qt-b36e357b982ba01cbf905fb1d0340e87030b0a95.tar.gz Qt-b36e357b982ba01cbf905fb1d0340e87030b0a95.tar.bz2 | |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (243 commits)
Fix compilation after merge.
SSL: Fix for capabilities in QSslCertificate auto test
Doc: update symbian capabilities regarding SSL
SSL: Fix crashes/hangs when retrieving CA certificates
Doc: Fixing typo
Coding style: bang cleanup.
Removed call to glFinish, obsoleted by fence syncs.
Helper-side support for QMeeGoFenceSync.
Plugin-side support for creating/destroying/waiting on fence sync.
Added MeeGo graphicssystem entry points for KHR_fence_sync.
Trailing whitespace fixes.
remove pointless assignment of deprecated variable
QDeclarativeDebug: Keep source information when changing an expression
Fix auto-test regression in tst_QDoubleValidator
Fixed tst_qpixmap::grabWidget autotest failure on QWS.
Use $${EPOCROOT} variable rather than absolute paths in .pro files
fix tst_headers
Fixed a shell syntax error in configure
Flickable does not reposition its content when it is resized.
Document that Transitions are exclusive.
...
Diffstat (limited to 'src/scripttools/debugging/qscriptdebuggeragent.cpp')
| -rw-r--r-- | src/scripttools/debugging/qscriptdebuggeragent.cpp | 6 |
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() { |