diff options
author | Kent Hansen <kent.hansen@nokia.com> | 2011-09-28 09:57:04 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-28 11:43:47 +0200 |
commit | 85569dfdff1caec2efb714a1a9cdc64094893ec1 (patch) | |
tree | a8eff782686b348c8ed0a97730e16156133e80ea /src/declarative/qml | |
parent | 9a8466839b030a4ffebf74a813737d7cc55aa1d0 (diff) |
Build with qt-in-namespace
Change-Id: Ia57e4f14d94ad63194dad52892bedf316a58a79a
Reviewed-on: http://codereview.qt-project.org/5693
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Diffstat (limited to 'src/declarative/qml')
-rw-r--r-- | src/declarative/qml/qdeclarativeguard_p.h | 4 | ||||
-rw-r--r-- | src/declarative/qml/v8/qv8qobjectwrapper.cpp | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/declarative/qml/qdeclarativeguard_p.h b/src/declarative/qml/qdeclarativeguard_p.h index 393f2b0ee7..0dc9a5a831 100644 --- a/src/declarative/qml/qdeclarativeguard_p.h +++ b/src/declarative/qml/qdeclarativeguard_p.h @@ -108,8 +108,12 @@ protected: virtual void objectDestroyed(T *) {} }; +QT_END_NAMESPACE + Q_DECLARE_METATYPE(QDeclarativeGuard<QObject>) +QT_BEGIN_NAMESPACE + QDeclarativeGuardImpl::QDeclarativeGuardImpl() : o(0), next(0), prev(0) { diff --git a/src/declarative/qml/v8/qv8qobjectwrapper.cpp b/src/declarative/qml/v8/qv8qobjectwrapper.cpp index 5b5c8be435..2649976513 100644 --- a/src/declarative/qml/v8/qv8qobjectwrapper.cpp +++ b/src/declarative/qml/v8/qv8qobjectwrapper.cpp @@ -56,11 +56,11 @@ #include <QtCore/qtimer.h> #include <QtCore/qatomic.h> -QT_BEGIN_NAMESPACE - Q_DECLARE_METATYPE(QJSValue); Q_DECLARE_METATYPE(QDeclarativeV8Handle); +QT_BEGIN_NAMESPACE + #if defined(__GNUC__) # if (__GNUC__ * 100 + __GNUC_MINOR__) >= 405 // The code in this file does not violate strict aliasing, but GCC thinks it does @@ -2070,3 +2070,6 @@ v8::Handle<v8::Value> MetaCallArgument::toValue(QV8Engine *engine) return v8::Undefined(); } } + +QT_END_NAMESPACE + |