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/items | |
| 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/items')
| -rw-r--r-- | src/declarative/items/context2d/qsgcontext2dcommandbuffer.cpp | 3 | ||||
| -rw-r--r-- | src/declarative/items/qsgdragtarget.cpp | 2 | ||||
| -rw-r--r-- | src/declarative/items/qsgvisualadaptormodel.cpp | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/src/declarative/items/context2d/qsgcontext2dcommandbuffer.cpp b/src/declarative/items/context2d/qsgcontext2dcommandbuffer.cpp index 224f640abc..550ad77515 100644 --- a/src/declarative/items/context2d/qsgcontext2dcommandbuffer.cpp +++ b/src/declarative/items/context2d/qsgcontext2dcommandbuffer.cpp @@ -46,6 +46,8 @@ #define HAS_SHADOW(offsetX, offsetY, blur, color) (color.isValid() && color.alpha() && (blur || offsetX || offsetY)) +QT_BEGIN_NAMESPACE + void qt_image_boxblur(QImage& image, int radius, bool quality); static QImage makeShadowImage(const QImage& image, qreal offsetX, qreal offsetY, qreal blur, const QColor& color) @@ -394,4 +396,5 @@ void QSGContext2DCommandBuffer::reset() imageIdx = 0; } +QT_END_NAMESPACE diff --git a/src/declarative/items/qsgdragtarget.cpp b/src/declarative/items/qsgdragtarget.cpp index 9ccc8703d4..5b6d36ee11 100644 --- a/src/declarative/items/qsgdragtarget.cpp +++ b/src/declarative/items/qsgdragtarget.cpp @@ -43,6 +43,8 @@ #include "qsgitem_p.h" #include "qsgcanvas.h" +QT_BEGIN_NAMESPACE + /*! \qmlclass DragEvent QSGDragEvent \brief The DragEvent object provides information about a drag event. diff --git a/src/declarative/items/qsgvisualadaptormodel.cpp b/src/declarative/items/qsgvisualadaptormodel.cpp index 3eb6214e47..4e3a1a6dc3 100644 --- a/src/declarative/items/qsgvisualadaptormodel.cpp +++ b/src/declarative/items/qsgvisualadaptormodel.cpp @@ -64,10 +64,10 @@ #include <QtCore/qhash.h> #include <QtCore/qlist.h> -QT_BEGIN_NAMESPACE - Q_DECLARE_METATYPE(QModelIndex) +QT_BEGIN_NAMESPACE + class VDMDelegateDataType : public QDeclarativeRefCount { public: |