diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-09-22 04:46:48 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-09-22 04:46:48 (GMT) |
| commit | cf82572d50470a4d48d1c564b55ad79bb205b228 (patch) | |
| tree | 866963563a849fd6bc9653bf602a6faa8a01a0a2 /tools/qmldebugger | |
| parent | 8fbd9381dc2bca5d686371a733e4c0d7d51123dc (diff) | |
| parent | 69ba43af52a42244805f866e5c2e0bb91dc6dec5 (diff) | |
| download | Qt-cf82572d50470a4d48d1c564b55ad79bb205b228.zip Qt-cf82572d50470a4d48d1c564b55ad79bb205b228.tar.gz Qt-cf82572d50470a4d48d1c564b55ad79bb205b228.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'tools/qmldebugger')
| -rw-r--r-- | tools/qmldebugger/engine.cpp | 2 | ||||
| -rw-r--r-- | tools/qmldebugger/engine.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/qmldebugger/engine.cpp b/tools/qmldebugger/engine.cpp index 1f4bcc2..6e163e6 100644 --- a/tools/qmldebugger/engine.cpp +++ b/tools/qmldebugger/engine.cpp @@ -43,7 +43,7 @@ EnginePane::EnginePane(QmlDebugConnection *client, QWidget *parent) enginesFile.open(QFile::ReadOnly); Q_ASSERT(enginesFile.isOpen()); - m_engineView = new QFxView(this); + m_engineView = new QmlView(this); m_engineView->rootContext()->setContextProperty("engines", qVariantFromValue(&m_engineItems)); m_engineView->setContentResizable(true); m_engineView->setQml(enginesFile.readAll()); diff --git a/tools/qmldebugger/engine.h b/tools/qmldebugger/engine.h index 52f0608..5ef28ae 100644 --- a/tools/qmldebugger/engine.h +++ b/tools/qmldebugger/engine.h @@ -4,7 +4,7 @@ #include <QWidget> #include <QtDeclarative/qmlengine.h> #include <QtDeclarative/qmlcontext.h> -#include <QtDeclarative/qfxview.h> +#include <QtDeclarative/qmlview.h> #include <QtDeclarative/qmldebug.h> QT_BEGIN_NAMESPACE @@ -51,7 +51,7 @@ private: QTreeWidget *m_objTree; QTableWidget *m_propTable; - QFxView *m_engineView; + QmlView *m_engineView; QList<QObject *> m_engineItems; }; |