summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-11-17 08:34:13 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-11-17 08:34:13 (GMT)
commit7edbd71fb5399e73af170c62fff2bcd753bc6c55 (patch)
tree66ee05fc66d30d575d429868ebce2b86a48f34f8 /tests/auto
parent0f8c867b1d5b13a56bd80f1819d4e71a9865b493 (diff)
parente963a1365d495649a1c8930f4776c78781218881 (diff)
downloadQt-7edbd71fb5399e73af170c62fff2bcd753bc6c55.zip
Qt-7edbd71fb5399e73af170c62fff2bcd753bc6c55.tar.gz
Qt-7edbd71fb5399e73af170c62fff2bcd753bc6c55.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Doc: Fixing typo Fix possible missing glyphs in text when using GL engine
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/collections/tst_collections.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/collections/tst_collections.cpp b/tests/auto/collections/tst_collections.cpp
index f81535e..43e1a52 100644
--- a/tests/auto/collections/tst_collections.cpp
+++ b/tests/auto/collections/tst_collections.cpp
@@ -1222,7 +1222,7 @@ void tst_Collections::vector()
}
}
- // this used to trigger an unitialized read in valgrind
+ // this used to trigger an uninitialized read in valgrind
QVector<char> foo;
foo.resize(144);