diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-24 09:54:46 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-24 09:54:46 (GMT) |
| commit | c6d893bc8ada7ddd3b9896ab43d05f7d764edf51 (patch) | |
| tree | e5e351346ce9aa3e13ed580d4ec0ef5f02a900da /tools | |
| parent | 2e2ce693e16899dcfd1f39374a78bf2ca3a0e016 (diff) | |
| parent | 4c975ee19b9671fbf76b546fc8ca2eff5bc69303 (diff) | |
| download | Qt-c6d893bc8ada7ddd3b9896ab43d05f7d764edf51.zip Qt-c6d893bc8ada7ddd3b9896ab43d05f7d764edf51.tar.gz Qt-c6d893bc8ada7ddd3b9896ab43d05f7d764edf51.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:
Compiler warning
Remove incorrect ASSERT
Be slightly more verbose on assigning undefined in binding.
Doc fixes
Don't crash when assigning a Behavior to a grouped property.
Get rid of 'noise' when using GL and the top-level item is an Item.
Fix visual tests after rename of the qml executable.
Do not attempt to setParent of object in a different thread
Don't polish QDeclarativeItems.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qml/qmlruntime.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/qml/qmlruntime.cpp b/tools/qml/qmlruntime.cpp index 8df250f..5136872 100644 --- a/tools/qml/qmlruntime.cpp +++ b/tools/qml/qmlruntime.cpp @@ -1240,7 +1240,8 @@ void QDeclarativeViewer::setUseGL(bool useGL) #endif QGLWidget *glWidget = new QGLWidget(format); - glWidget->setAutoFillBackground(false); + //### potentially faster, but causes junk to appear if top-level is Item, not Rectangle + //glWidget->setAutoFillBackground(false); canvas->setViewport(glWidget); } |