summaryrefslogtreecommitdiffstats
path: root/src/activeqt/shared
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-10-26 01:16:18 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-10-26 01:16:18 (GMT)
commit9e17ec82f6915a636338c8be693773ec21db3a92 (patch)
tree46bde7e8b2b5b522b4710d895bf38a0d384f37e0 /src/activeqt/shared
parentd67a5534cb50f66807b87526d42603c7d4df3595 (diff)
parentef704ebad66559170d761459d42d6c99996db529 (diff)
downloadQt-9e17ec82f6915a636338c8be693773ec21db3a92.zip
Qt-9e17ec82f6915a636338c8be693773ec21db3a92.tar.gz
Qt-9e17ec82f6915a636338c8be693773ec21db3a92.tar.bz2
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src/activeqt/shared')
-rw-r--r--src/activeqt/shared/qaxtypes.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/activeqt/shared/qaxtypes.cpp b/src/activeqt/shared/qaxtypes.cpp
index dfec8178..4a38544 100644
--- a/src/activeqt/shared/qaxtypes.cpp
+++ b/src/activeqt/shared/qaxtypes.cpp
@@ -547,7 +547,7 @@ bool QVariantToVARIANT(const QVariant &var, VARIANT &arg, const QByteArray &type
SAFEARRAY *array = 0;
bool is2D = false;
// If the first element in the array is a list the whole list is
- // treated as a 2D array. The colum count is taken from the 1st element.
+ // treated as a 2D array. The column count is taken from the 1st element.
if (count) {
QVariantList col = list.at(0).toList();
int maxColumns = col.count();