summaryrefslogtreecommitdiff
path: root/src/opengl/gl2paintengineex/qglengineshadermanager_p.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-10-25 18:35:57 +0200
committerQt Continuous Integration System <qt-info@nokia.com>2010-10-25 18:35:57 +0200
commit50e915e4fe8b6bcd579f5fae31bfa9d736f9b6f5 (patch)
tree7517568b333bcc5679e7a165c48aaa7bd06a66fb /src/opengl/gl2paintengineex/qglengineshadermanager_p.h
parent61f013168e5ef5111948a1ae0a1464753986adb2 (diff)
parentce40a078caa4a09793128ca730cc5ca268aeee87 (diff)
downloadqt4-tools-50e915e4fe8b6bcd579f5fae31bfa9d736f9b6f5.tar.gz
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src/opengl/gl2paintengineex/qglengineshadermanager_p.h')
-rw-r--r--src/opengl/gl2paintengineex/qglengineshadermanager_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/gl2paintengineex/qglengineshadermanager_p.h b/src/opengl/gl2paintengineex/qglengineshadermanager_p.h
index e5ababff32..d24f3023ef 100644
--- a/src/opengl/gl2paintengineex/qglengineshadermanager_p.h
+++ b/src/opengl/gl2paintengineex/qglengineshadermanager_p.h
@@ -455,7 +455,7 @@ public:
AttributeOpacity
};
- // There are optimisations we can do, depending on the brush transform:
+ // There are optimizations we can do, depending on the brush transform:
// 1) May not have to apply perspective-correction
// 2) Can use lower precision for matrix
void optimiseForBrushTransform(QTransform::TransformationType transformType);