diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-08-03 05:39:57 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-08-03 05:39:57 (GMT) |
| commit | 68c0ff0c7f1e65fb55b08a1fb9baab8176eb726c (patch) | |
| tree | e3ae65fb615a4b06d774415fd2d742170104d9ce /src/script/api/qscriptcontextinfo.cpp | |
| parent | b7702b2dcbc36f81759dea0ad74fb19e97b2358f (diff) | |
| parent | e62f266a7642e675e9d235a1f54a6b5746500d48 (diff) | |
| download | Qt-68c0ff0c7f1e65fb55b08a1fb9baab8176eb726c.zip Qt-68c0ff0c7f1e65fb55b08a1fb9baab8176eb726c.tar.gz Qt-68c0ff0c7f1e65fb55b08a1fb9baab8176eb726c.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/script/api/qscriptcontextinfo.cpp')
| -rw-r--r-- | src/script/api/qscriptcontextinfo.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/script/api/qscriptcontextinfo.cpp b/src/script/api/qscriptcontextinfo.cpp index ebb1770..a90e014 100644 --- a/src/script/api/qscriptcontextinfo.cpp +++ b/src/script/api/qscriptcontextinfo.cpp @@ -53,8 +53,7 @@ QT_BEGIN_NAMESPACE current statement. If the called function is executing Qt Script code, you can obtain - the script location with the functions fileName(), lineNumber() and - columnNumber(). + the script location with the functions fileName() and lineNumber(). You can obtain the starting line number and ending line number of a Qt Script function definition with functionStartLineNumber() and @@ -317,13 +316,7 @@ int QScriptContextInfo::lineNumber() const } /*! - Returns the column number corresponding to the statement being - executed, or -1 if the column number is not available. - - The column number is only available if Qt Script code is being - executed. - - \sa lineNumber(), fileName() + \obsolete */ int QScriptContextInfo::columnNumber() const { |