diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-06 12:18:07 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-06 12:18:07 (GMT) |
| commit | b79f79399dac8a3e16c7d1a3724965b3e166f46c (patch) | |
| tree | 975516643c5b9861034d81b8ab4500d27716e7c0 /tools | |
| parent | fded09d4e2983d7eed82c9fa5b678f70074473ba (diff) | |
| parent | c3848a886448a15ae87801099849018d761026ed (diff) | |
| download | Qt-b79f79399dac8a3e16c7d1a3724965b3e166f46c.zip Qt-b79f79399dac8a3e16c7d1a3724965b3e166f46c.tar.gz Qt-b79f79399dac8a3e16c7d1a3724965b3e166f46c.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix AnchorAnimation for multiple AnchorChanges with dependancies.
Fix recording of QML visual tests when using a QGLWidget viewport.
Fix PathView item position on insertion and removal.
Small cleanup
Ensure WebView gets focus when an editable node is clicked on.
Ensure slider is updated when screen size changes.
Do not reset sourceSize when changing image source url.
Ensure all image state is updated before emitting changed signals.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qml/main.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp index 7421b5e..78cd64d 100644 --- a/tools/qml/main.cpp +++ b/tools/qml/main.cpp @@ -441,6 +441,7 @@ static QDeclarativeViewer *createViewer() QDeclarativeViewer *viewer = new QDeclarativeViewer(0, wflags); viewer->setAttribute(Qt::WA_DeleteOnClose, true); + viewer->setUseGL(opts.useGL); if (!opts.scriptopts.isEmpty()) { viewer->setScriptOptions(opts.scriptOptions); @@ -492,8 +493,6 @@ void showViewer(QDeclarativeViewer *viewer) viewer->showMaximized(); else viewer->show(); - - viewer->setUseGL(opts.useGL); viewer->raise(); } |