diff options
| author | Lorn Potter <lorn.potter@nokia.com> | 2010-03-24 23:06:43 (GMT) |
|---|---|---|
| committer | Lorn Potter <lorn.potter@nokia.com> | 2010-03-24 23:06:43 (GMT) |
| commit | d20510dd91e01b15e2346c0cb12e352080b6a093 (patch) | |
| tree | 83554f5c96f69df6fe6d9d5c2a9f529a3b1316d8 /src/script/api/qscriptengine.cpp | |
| parent | f727f993c3c4e3f548b06d57b3ee0da4f3914bae (diff) | |
| parent | 8218a16815d883823d3411be9896332b997f3e91 (diff) | |
| download | Qt-d20510dd91e01b15e2346c0cb12e352080b6a093.zip Qt-d20510dd91e01b15e2346c0cb12e352080b6a093.tar.gz Qt-d20510dd91e01b15e2346c0cb12e352080b6a093.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Conflicts:
src/plugins/bearer/corewlan/qcorewlanengine.mm
Diffstat (limited to 'src/script/api/qscriptengine.cpp')
| -rw-r--r-- | src/script/api/qscriptengine.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp index 356b4d0..2650d7f 100644 --- a/src/script/api/qscriptengine.cpp +++ b/src/script/api/qscriptengine.cpp @@ -292,6 +292,7 @@ QT_BEGIN_NAMESPACE \value ExcludeSuperClassProperties The script object will not expose properties inherited from the superclass. \value ExcludeSuperClassContents Shorthand form for ExcludeSuperClassMethods | ExcludeSuperClassProperties \value ExcludeDeleteLater The script object will not expose the QObject::deleteLater() slot. + \value ExcludeSlots The script object will not expose the QObject's slots. \value AutoCreateDynamicProperties Properties that don't already exist in the QObject will be created as dynamic properties of that object, rather than as properties of the script object. \value PreferExistingWrapperObject If a wrapper object with the requested configuration already exists, return that object. \value SkipMethodsInEnumeration Don't include methods (signals and slots) when enumerating the object's properties. |