feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlStandaloneApp: Fix template to use new QDeclarativeObserver

Browse Source
This commit is contained in:
Kai Koehne
2010-09-16 14:41:39 +02:00
parent 610711724b
commit b7384af062
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.cpp
View File

@@ -7,6 +7,10 @@
#include <QtDeclarative/QDeclarativeEngine>
#include <QtDeclarative/QDeclarativeContext>
#if defined(QMLINSPECTOR)
#include <qdeclarativeviewobserver.h>
#endif
#if defined(Q_OS_SYMBIAN) && defined(ORIENTATIONLOCK)
#include <eikenv.h>
#include <eikappui.h>
@@ -41,15 +45,14 @@ QString QmlApplicationViewerPrivate::adjustPath(const QString &path)
}
QmlApplicationViewer::QmlApplicationViewer(QWidget *parent) :
#ifdef QMLINSPECTOR
QmlViewer::QDeclarativeViewObserver(parent)
#else
QDeclarativeView(parent)
#endif
, m_d(new QmlApplicationViewerPrivate)
QDeclarativeView(parent),
m_d(new QmlApplicationViewerPrivate)
{
connect(engine(), SIGNAL(quit()), SLOT(close()));
setResizeMode(QDeclarativeView::SizeRootObjectToView);
#ifdef QMLINSPECTOR
new QmlViewer::QDeclarativeViewObserver(this, parent);
#endif
}
QmlApplicationViewer::~QmlApplicationViewer()