diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-09-29 06:49:11 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-09-29 06:49:11 (GMT) |
| commit | ff6c8f9439630c2ea3bf78d5568a44521e915898 (patch) | |
| tree | ff3fc149ebc6547dda412500aadeacbe568e2ceb /src/script/bridge/qscriptobject.cpp | |
| parent | 6034fc5b4a15bab2ab65e4cc3963fe00bdcb415b (diff) | |
| parent | fd5269a9a80bf8b119086b3f326c72a332aba4e9 (diff) | |
| download | Qt-ff6c8f9439630c2ea3bf78d5568a44521e915898.zip Qt-ff6c8f9439630c2ea3bf78d5568a44521e915898.tar.gz Qt-ff6c8f9439630c2ea3bf78d5568a44521e915898.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/script/bridge/qscriptobject.cpp')
| -rw-r--r-- | src/script/bridge/qscriptobject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/script/bridge/qscriptobject.cpp b/src/script/bridge/qscriptobject.cpp index 0d899f8..55644fe 100644 --- a/src/script/bridge/qscriptobject.cpp +++ b/src/script/bridge/qscriptobject.cpp @@ -46,8 +46,8 @@ namespace JSC { //QT_USE_NAMESPACE -ASSERT_CLASS_FITS_IN_CELL(QScriptObject); -ASSERT_CLASS_FITS_IN_CELL(QScriptObjectPrototype); +ASSERT_CLASS_FITS_IN_CELL(QT_PREPEND_NAMESPACE(QScriptObject)); +ASSERT_CLASS_FITS_IN_CELL(QT_PREPEND_NAMESPACE(QScriptObjectPrototype)); } QT_BEGIN_NAMESPACE |