summaryrefslogtreecommitdiffstats
path: root/demos/spreadsheet
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-10-25 16:35:57 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-10-25 16:35:57 (GMT)
commit50e915e4fe8b6bcd579f5fae31bfa9d736f9b6f5 (patch)
tree7517568b333bcc5679e7a165c48aaa7bd06a66fb /demos/spreadsheet
parent61f013168e5ef5111948a1ae0a1464753986adb2 (diff)
parentce40a078caa4a09793128ca730cc5ca268aeee87 (diff)
downloadQt-50e915e4fe8b6bcd579f5fae31bfa9d736f9b6f5.zip
Qt-50e915e4fe8b6bcd579f5fae31bfa9d736f9b6f5.tar.gz
Qt-50e915e4fe8b6bcd579f5fae31bfa9d736f9b6f5.tar.bz2
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'demos/spreadsheet')
-rw-r--r--demos/spreadsheet/spreadsheet.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/demos/spreadsheet/spreadsheet.cpp b/demos/spreadsheet/spreadsheet.cpp
index f2a1738..519afe9 100644
--- a/demos/spreadsheet/spreadsheet.cpp
+++ b/demos/spreadsheet/spreadsheet.cpp
@@ -511,7 +511,7 @@ void SpreadSheet::setupContents()
// column 2
table->setItem(0, 2, new SpreadSheetItem("Price"));
table->item(0, 2)->setBackgroundColor(titleBackground);
- table->item(0, 2)->setToolTip("This collumn shows the price of the purchase");
+ table->item(0, 2)->setToolTip("This column shows the price of the purchase");
table->item(0, 2)->setFont(titleFont);
table->setItem(1, 2, new SpreadSheetItem("150"));