diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-04 12:10:00 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-04 12:10:00 (GMT) |
| commit | 3cd611df87645df05fcc747ebb5dcebff05132e4 (patch) | |
| tree | c171f7497d26977f9e73f1e267b82e600eb98283 /src/script | |
| parent | bea0a4195bcd641a05ae7195cf319590a254b876 (diff) | |
| parent | 2c4a5cee336aba5f2da52ac4c59b502cf4d82164 (diff) | |
| download | Qt-3cd611df87645df05fcc747ebb5dcebff05132e4.zip Qt-3cd611df87645df05fcc747ebb5dcebff05132e4.tar.gz Qt-3cd611df87645df05fcc747ebb5dcebff05132e4.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: (166 commits)
Fix the include header <qstring.h> -> <QtCore/qstring.h>
bye bye QMakeProjectEnv
short-cut evaluation inside if() tests
eliminate special splitting of INCLUDEPATH and DEPENDPATH
do not env-expand cache file path
s/QMAKE_FRAMEWORKDIR_FLAGS/QMAKE_FRAMEWORKPATH_FLAGS/
s/INCPATH/INCLUDEPATH/
s/QMAKE_RPATH/QMAKE_LFLAGS_RPATH/
teach configure QMAKE_LFLAGS_RPATH (in addition to obsolete QMAKE_RPATH)
warn about usage of deprecated variables
warn about using non-lowercased replace $$function()s
add -Wdeprecated option (on by default)
make QMakeProject::isEmpty() consider legacy mappings
document some functions' scope
fix $$size() not using function-scoped variables
doc: Fixed some qdoc errors.
qdoc: Added breadcrumbs for namespaces.
Autotest: check that we receive key events on toplevel widgets
Cocoa: key events stopped working
Fix desktopservices demo missing icon in Symbian
...
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/bridge/qscriptqobject_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/bridge/qscriptqobject_p.h b/src/script/bridge/qscriptqobject_p.h index b82bcb7..412a784 100644 --- a/src/script/bridge/qscriptqobject_p.h +++ b/src/script/bridge/qscriptqobject_p.h @@ -303,7 +303,7 @@ public: } protected: - static const unsigned StructureFlags = JSC::OverridesGetOwnPropertySlot | JSC::OverridesMarkChildren | JSC::OverridesGetPropertyNames | JSObject::StructureFlags; + static const unsigned StructureFlags = JSC::OverridesGetOwnPropertySlot | JSC::OverridesMarkChildren | JSC::OverridesGetPropertyNames | JSC::ImplementsHasInstance | JSObject::StructureFlags; Data *data; }; |