diff options
| author | hjk <qtc-committer@nokia.com> | 2009-08-24 14:57:01 (GMT) |
|---|---|---|
| committer | hjk <qtc-committer@nokia.com> | 2009-08-24 15:32:14 (GMT) |
| commit | cf354eb2bb24de1076f126c526317ac7e1d9ac4d (patch) | |
| tree | 75d721fa5b94a4d15cb9d6d612bd18b868b54ec3 /src/script/bridge/qscriptqobject.cpp | |
| parent | 5b680a3c2c5e59fe899fa19e4d1c4cb251325f29 (diff) | |
| download | Qt-cf354eb2bb24de1076f126c526317ac7e1d9ac4d.zip Qt-cf354eb2bb24de1076f126c526317ac7e1d9ac4d.tar.gz Qt-cf354eb2bb24de1076f126c526317ac7e1d9ac4d.tar.bz2 | |
compile fix with namespaced Qt
Diffstat (limited to 'src/script/bridge/qscriptqobject.cpp')
| -rw-r--r-- | src/script/bridge/qscriptqobject.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/script/bridge/qscriptqobject.cpp b/src/script/bridge/qscriptqobject.cpp index 34e6504..ac540ef 100644 --- a/src/script/bridge/qscriptqobject.cpp +++ b/src/script/bridge/qscriptqobject.cpp @@ -61,10 +61,9 @@ #include "RegExpObject.h" #include "RegExpConstructor.h" -QT_BEGIN_NAMESPACE - namespace JSC { +QT_USE_NAMESPACE ASSERT_CLASS_FITS_IN_CELL(QScript::QObjectPrototype); ASSERT_CLASS_FITS_IN_CELL(QScript::QMetaObjectWrapperObject); ASSERT_CLASS_FITS_IN_CELL(QScript::QMetaObjectPrototype); @@ -72,6 +71,8 @@ ASSERT_CLASS_FITS_IN_CELL(QScript::QtFunction); ASSERT_CLASS_FITS_IN_CELL(QScript::QtPropertyFunction); } +QT_BEGIN_NAMESPACE + namespace QScript { @@ -2209,12 +2210,12 @@ void QObjectData::registerWrapper(QScriptObject *wrapper, } // namespace QScript +QT_END_NAMESPACE + namespace JSC { ASSERT_CLASS_FITS_IN_CELL(QScript::QtFunction); } -QT_END_NAMESPACE - #include "moc_qscriptqobject_p.cpp" |