diff options
author | David Boddie <dboddie@trolltech.com> | 2010-04-26 11:34:16 (GMT) |
---|---|---|
committer | David Boddie <dboddie@trolltech.com> | 2010-04-26 11:34:16 (GMT) |
commit | 7cfb1403dc66e9151edc5a6c9b723444f2584941 (patch) | |
tree | 5884070ffaee8f7b5774dedcce6994437dcb43fe /doc/src/declarative/snippets | |
parent | 4dba5cc0085482dccfbe70d8c157e094296feed1 (diff) | |
parent | 2ee996bb3e8449e9c9d153326a2f55bc07b6b864 (diff) | |
download | Qt-7cfb1403dc66e9151edc5a6c9b723444f2584941.zip Qt-7cfb1403dc66e9151edc5a6c9b723444f2584941.tar.gz Qt-7cfb1403dc66e9151edc5a6c9b723444f2584941.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Conflicts:
tools/assistant/tools/assistant/helpviewer.cpp
tools/assistant/tools/assistant/helpviewer_qwv.cpp
Diffstat (limited to 'doc/src/declarative/snippets')
-rw-r--r-- | doc/src/declarative/snippets/integrating/graphicswidgets/bluecircle.h | 3 | ||||
-rw-r--r-- | doc/src/declarative/snippets/integrating/graphicswidgets/redsquare.h | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/doc/src/declarative/snippets/integrating/graphicswidgets/bluecircle.h b/doc/src/declarative/snippets/integrating/graphicswidgets/bluecircle.h index 028718f..73d66b7 100644 --- a/doc/src/declarative/snippets/integrating/graphicswidgets/bluecircle.h +++ b/doc/src/declarative/snippets/integrating/graphicswidgets/bluecircle.h @@ -39,7 +39,6 @@ ** ****************************************************************************/ //![0] -#include <QtDeclarative/qdeclarative.h> #include <QGraphicsWidget> #include <QPainter> @@ -53,6 +52,4 @@ public: painter->drawEllipse(0, 0, size().width(), size().height()); } }; - -QML_DECLARE_TYPE(BlueCircle) //![0] diff --git a/doc/src/declarative/snippets/integrating/graphicswidgets/redsquare.h b/doc/src/declarative/snippets/integrating/graphicswidgets/redsquare.h index 76e7d11..3050662 100644 --- a/doc/src/declarative/snippets/integrating/graphicswidgets/redsquare.h +++ b/doc/src/declarative/snippets/integrating/graphicswidgets/redsquare.h @@ -39,7 +39,6 @@ ** ****************************************************************************/ //![0] -#include <QtDeclarative/qdeclarative.h> #include <QGraphicsWidget> #include <QPainter> @@ -52,6 +51,4 @@ public: painter->fillRect(0, 0, size().width(), size().height(), QColor(Qt::red)); } }; - -QML_DECLARE_TYPE(RedSquare) //![0] |