diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-06-30 04:42:16 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-06-30 04:42:16 (GMT) |
| commit | c9135a429441cb00720866604b79d6613000f7c5 (patch) | |
| tree | b338494396f892094afa933d8f10475215752c0a /src/declarative/debugger/qmlobjecttree.cpp | |
| parent | dba327eec1a308e61c2bd21941ba982fb9283827 (diff) | |
| parent | a77153a64e8559b21a7e6ea53fe26eb2719ce9f5 (diff) | |
| download | Qt-c9135a429441cb00720866604b79d6613000f7c5.zip Qt-c9135a429441cb00720866604b79d6613000f7c5.tar.gz Qt-c9135a429441cb00720866604b79d6613000f7c5.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/extra/extra.pri
Diffstat (limited to 'src/declarative/debugger/qmlobjecttree.cpp')
| -rw-r--r-- | src/declarative/debugger/qmlobjecttree.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/declarative/debugger/qmlobjecttree.cpp b/src/declarative/debugger/qmlobjecttree.cpp index 27dc000..8a2358a 100644 --- a/src/declarative/debugger/qmlobjecttree.cpp +++ b/src/declarative/debugger/qmlobjecttree.cpp @@ -48,6 +48,8 @@ #include <QtGui/qinputdialog.h> #include <QtGui/qboxlayout.h> +QT_BEGIN_NAMESPACE + QmlObjectTree::QmlObjectTree(QWidget *parent) : QTreeWidget(parent) { @@ -73,3 +75,4 @@ void QmlObjectTree::mousePressEvent(QMouseEvent *me) } } +QT_END_NAMESPACE |