summaryrefslogtreecommitdiffstats
path: root/tools/qml
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-05-25 06:45:19 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-05-25 06:45:19 (GMT)
commitfbfdb18e246f5e22f1252471be67182ff1acfe36 (patch)
tree857a01da09d69df0ed87f730534cac92a8e5a0e8 /tools/qml
parent10b28224afeabb388d21c32aac5f51f5ecea58ed (diff)
parentb02bf4ef805e33a763d86ec8ff496a27fddc8ad8 (diff)
downloadQt-fbfdb18e246f5e22f1252471be67182ff1acfe36.zip
Qt-fbfdb18e246f5e22f1252471be67182ff1acfe36.tar.gz
Qt-fbfdb18e246f5e22f1252471be67182ff1acfe36.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'tools/qml')
-rw-r--r--tools/qml/qmlruntime.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/qml/qmlruntime.cpp b/tools/qml/qmlruntime.cpp
index d00d7d9..5308e98 100644
--- a/tools/qml/qmlruntime.cpp
+++ b/tools/qml/qmlruntime.cpp
@@ -1214,7 +1214,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);
}