From 9429424b52a9c66d6313d3085ef5638f87ee0055 Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Thu, 6 Aug 2009 12:08:50 +0200 Subject: remove docs that mention QScriptValue::{scope,setScope}() Those functions are internal and we don't want to support them in the JSC back-end, because they expose too much implementation detail of the old back-end. --- doc/src/qtscript.qdoc | 38 -------------------------------------- src/script/api/qscriptvalue.cpp | 4 ++-- 2 files changed, 2 insertions(+), 40 deletions(-) diff --git a/doc/src/qtscript.qdoc b/doc/src/qtscript.qdoc index 6b8f639..43dc42f 100644 --- a/doc/src/qtscript.qdoc +++ b/doc/src/qtscript.qdoc @@ -1230,44 +1230,6 @@ for it, evaluate the script, and finally restore the old context. \endlist - \section2 Nested Functions and the Scope Chain - - This is an advanced topic; feel free to skip it. - - A nested function can be used to "capture" the execution context in which a - nested function object is created; this is typically referred to as creating - a \e closure. When, at some later time, the nested function is invoked, it - can access the variables that were created when the enclosing function was - invoked. This can perhaps best be illustrated through a small example: - - \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 70 - - The \c{counter()} function initializes a local variable to zero, - and returns a nested function. The nested function increments - the "outer" variable and returns its new value. The variable - persists over function calls, as shown in the following example: - - \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 71 - - The \c{counter()} function can be implemented as a native function, too - \mdash or rather, as a pair of native functions: One for the outer and - one for the inner. The definition of the outer function is as follows: - - \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 72 - - The function creates a local variable and initializes it to zero. - Then it wraps the inner native function, and sets the scope of - the resulting function object to be the activation object associated - with this (the outer) function call. The inner function accesses - the "outer" activation through the scope of the callee: - - \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 73 - - It is also possible to have a hybrid approach, where the outer function - is a native function and the inner function is defined by a script: - - \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 74 - \section2 Property Getters and Setters A script object property can be defined in terms of a getter/setter diff --git a/src/script/api/qscriptvalue.cpp b/src/script/api/qscriptvalue.cpp index ae1235e..47f51b9 100644 --- a/src/script/api/qscriptvalue.cpp +++ b/src/script/api/qscriptvalue.cpp @@ -193,9 +193,9 @@ QT_BEGIN_NAMESPACE \value ResolvePrototype Check the object's own properties first, then search the prototype chain. This is the default. - \value ResolveScope Check the object's own properties first, then search the scope chain. + \omitvalue ResolveScope Check the object's own properties first, then search the scope chain. - \value ResolveFull Check the object's own properties first, then search the prototype chain, and finally search the scope chain. + \omitvalue ResolveFull Check the object's own properties first, then search the prototype chain, and finally search the scope chain. */ // ### move -- cgit v0.12 option value='5'>5space:mode:
authorThomas Wouters <thomas@python.org>2006-12-13 04:49:30 (GMT)
committerThomas Wouters <thomas@python.org>2006-12-13 04:49:30 (GMT)
commit89f507fe8c497b3f70fdcecce8bc240f9af2bbe2 (patch)
tree8acfdf7de23d9802924a2cef9f8ed32222eaa8f4 /Misc/HISTORY
parent16f3e03283cdbea6101d21960743d3901ddf8d57 (diff)
downloadommitgraph'>* Fixing hellogl_es2 for Windows CEThomas Hartmann2009-05-081-0/+6
| | | | | | We hardcode the lib names for 4.5 Reviewed-by: Maurice
* Fixed typo in README fileNils Christian Roscher-Nielsen2009-05-061-1/+1
| | | | Reviewed-by: David Boddie <dboddie@trolltech.com>
* Corrected bugs in the flow layout exampleMorten Engvoldsen2009-04-294-6/+30
| | | | | | | Corrected bugs in the example and added markers for snippets in the documentation. Task-number: 250616 Rev-by: Geir Vattekar
* fixed minor issue with the piechart demoPierre Rossi2009-04-241-1/+1
| | | | | | | | The rubberband was not set on the viewport, leading to an offset when adding margins. Task-number: 251892 Reviewed-by: Alexis
* Add Google Suggest as a new network exampleAriya Hidayat2009-04-237-0/+498
| | | | Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Added Google Chat client as a new WebKit exampleAriya Hidayat2009-04-236-1/+512
| | | | Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Add fancy browser as the new exampleAriya Hidayat2009-04-237-1/+331
| | | | Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Fix more NaNs in Elastic Nodes exampleJoão Abecasis2009-04-221-3/+6
| | | | | | | Don't try to draw zero-length lines. Don't draw lines if nodes are superimposed. Reviewed-by: Andreas
* BT: Fix lock-up & crash in the Elastic Nodes exampleAndreas Aardal Hanssen2009-04-211-3/+8
| | | | | | | | Ensure that we don't divide by 0 when two nodes are exactly on top of each other. Reviewed-by: Alexis Reviewed-by: Joao
* Unable to build ActiveQt with Opensource edition.Prasanth Ullattil2009-04-201-1/+1
| | | | | | | Updated the project files and headers necessary for enabling this. Reviewed-by: Thiago Macieira Reviewed-by: Jens Bache-Wiig
* Use setContentsMargins() instead of setMargin().Jan-Arve Sæther2009-04-161-2/+2
| | | | setMargin() is deprecated.
* Doc - Changed the link provided in the README file to one that does notKavindra Devi Palaraja2009-04-161-1/+1
| | | | | | | have a version number, so we do not have to update it each release. Task-number: 251352 Reviewed-by: TrustMe
* Doc - Some minor cleanups in the documentation of QInputDialog. AlsoKavindra Devi Palaraja2009-04-161-3/+3
| | | | | | | | | | marked getInt() as since Qt 4.5 and finally modified the StandardDialogs example to reflect the fact that getInteger() is deprecated. Task-number: 251288 Reviewed-by: nrc <qt-info@nokia.com> BT: Yes
* Fixed and improved the example codeJan-Arve Sæther2009-04-152-14/+58
|
* BT: Adjust the colliding mice example to work with coalesced updates.Norwegian Rock Cat2009-04-063-7/+9
| | | | | | | | | | | | | | | | | | | It seems that Cocoa is much more strict about coalesced updates than Carbon ever was. The upshot of this is that some examples that "worked" after a fashion in Carbon, do not exhibit good frame rates with Cocoa. The reason why is that apparently Cocoa will decide to flush to the screen every time a timer fires. If you have a lot of timers that are all dependent on doing on update to the screen, you will get undesirable effects. Thankfully, it is possible to adjust the examples to follow best practices and get a good result. So, we now only do the animation once using QGraphicsScene::advance(). We are also able to make the mice less heavy (no QObject subclass). I've updated the docs and someone on the doc team has kindly volunteered to go through them. Reviewed-by: Andreas
* Install the animation.mng file.Thiago Macieira2009-04-061-1/+1
| | | | | | | | Otherwise, for people who install Qt (everyone outside Nokia), the animation file isn't present. Reviewed-by: Trust Me BT: yes
* Squashed commit of the following:David Boddie2009-03-261-0/+5
| | | | | | | | | | commit e67776ff836b1e761dd1db1945daddc6394b6a54 Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 17:47:42 2009 +0100 Doc: Added missing file. Reviewed-by: TrustMe
* Squashed commit of the following:David Boddie2009-03-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | commit 23e30464792f7e403e0815775eb7acbaad975238 Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 17:41:20 2009 +0100 Doc: Added some basic documentation for the QSvgGenerator class. Task-number: 244944 Reviewed-by: TrustMe commit f84c1806d2ba40a61499584562d754f65d43f854 Merge: 8a42be7... 213d922... Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 16:59:14 2009 +0100 Merge branch '4.5' of ../qt-45 into qt/4.5 commit 8a42be789077de45f8fd9f13afd177798df7495e Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 16:58:33 2009 +0100 Doc: Added missing pieces for the SVG Generator example. Reviewed-by: David Boddie <dboddie@trolltech.com>
* Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5David Boddie2009-03-261-1/+1
|\
| * Make the traffic info example not hit the server every minute.Thiago Macieira2009-03-261-1/+1
| | | | | | | | | | | | | | | | The most frequent service in Oslo is every 5 minutes, so this should be a reasonable update interval. Let's hope that Trafikanten will stop blocking us in their firewall now. Reviewed-by: Trust Me
* | Squashed commit of the following:David Boddie2009-03-268-0/+712
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 8af45bfd7efe647963bcedf1736b62ee8568590d Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 16:39:31 2009 +0100 Doc: Committed a stray change. Reviewed-by: David Boddie commit 2aa564839e6a4821e9419230a1dd13ef691c679d Merge: f9e590a... db3c3ca... Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 16:38:53 2009 +0100 Merge branch '4.5' of ../qt-45 into qt/4.5 commit f9e590a4ef3e134cf2a1606a6fe3307df6935e96 Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 16:37:02 2009 +0100 Doc: Simplified the SVG Generator example and updated the list of examples. Committing before merging into the 4.5 branch. Reviewed-by: David Boddie <dboddie@trolltech.com> commit ba35080c7d728b9e47ac68e74fe62877285c400f Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 14:29:13 2009 +0100 Doc: Added a SVG generator example. This example shows how to paint on an QSvgGenerator device. Reviewed-by: David Boddie <dboddie@trolltech.com>
* Long live Qt 4.5!Lars Knoll2009-03-23