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.h | |
| 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.h')
| -rw-r--r-- | src/script/api/qscriptengine.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/script/api/qscriptengine.h b/src/script/api/qscriptengine.h index 2ce3183..76461bc 100644 --- a/src/script/api/qscriptengine.h +++ b/src/script/api/qscriptengine.h @@ -125,6 +125,7 @@ public: ExcludeSuperClassContents = 0x0006, SkipMethodsInEnumeration = 0x0008, ExcludeDeleteLater = 0x0010, + ExcludeSlots = 0x0020, AutoCreateDynamicProperties = 0x0100, PreferExistingWrapperObject = 0x0200 |