diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-05-05 22:51:05 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-05-05 22:51:05 (GMT) |
| commit | 1824eb63f6b2f8baa26b20c57fc50db84eefaa30 (patch) | |
| tree | ecca3da0e36589d1a47b0bac7da14bf365d69664 | |
| parent | 57c6b39a72e037fe50cda7005cea79d1c4dcd888 (diff) | |
| parent | 053fcebb7ef1b3899b656d511437a8139ee012b7 (diff) | |
| download | Qt-1824eb63f6b2f8baa26b20c57fc50db84eefaa30.zip Qt-1824eb63f6b2f8baa26b20c57fc50db84eefaa30.tar.gz Qt-1824eb63f6b2f8baa26b20c57fc50db84eefaa30.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7
| -rw-r--r-- | tools/qml/qmlruntime.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/qml/qmlruntime.cpp b/tools/qml/qmlruntime.cpp index 1229df2..fe0f67c 100644 --- a/tools/qml/qmlruntime.cpp +++ b/tools/qml/qmlruntime.cpp @@ -469,6 +469,7 @@ QDeclarativeViewer::QDeclarativeViewer(QWidget *parent, Qt::WindowFlags flags) , m_scriptOptions(0) , tester(0) , useQmlFileBrowser(true) + , translator(0) { QDeclarativeViewer::registerTypes(); setWindowTitle(tr("Qt Qml Runtime")); |