summaryrefslogtreecommitdiffstats
path: root/src/widgets
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@nokia.com>2012-07-11 14:44:38 +0200
committerQt by Nokia <qt-info@nokia.com>2012-07-11 14:52:37 +0200
commit59339941e0e6e2b8648c2e128284de188a65714b (patch)
treed2f19ebbac24dfc5872509cb74262375cd3e8962 /src/widgets
parent62e6608f6932c6d871d17b0ccce0c7b388866458 (diff)
Fix some spelling errors
Change-Id: I19d3b2e9a5180b13deb828b55195404ef20be295 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Diffstat (limited to 'src/widgets')
-rw-r--r--src/widgets/itemviews/qheaderview.cpp4
-rw-r--r--src/widgets/styles/qstylesheetstyle.cpp2
-rw-r--r--src/widgets/widgets/qdockwidget.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/widgets/itemviews/qheaderview.cpp b/src/widgets/itemviews/qheaderview.cpp
index 0cd80f2e0a..8ba5d74946 100644
--- a/src/widgets/itemviews/qheaderview.cpp
+++ b/src/widgets/itemviews/qheaderview.cpp
@@ -3527,7 +3527,7 @@ bool QHeaderViewPrivate::read(QDataStream &in)
in >> hiddenSectionSize;
in >> length;
- int unusedSectionCount; // For compability
+ int unusedSectionCount; // For compatibility
in >> unusedSectionCount;
in >> movableSections;
in >> clickableSections;
@@ -3548,7 +3548,7 @@ bool QHeaderViewPrivate::read(QDataStream &in)
in >> sectionItems;
// In Qt4 we had a vector of spans where one span could hold information on more sections.
// Now we have an itemvector where one items contains information about one section
- // For backward compability with Qt4 we do the following
+ // For backward compatibility with Qt4 we do the following
QVector<SectionItem> newSectionItems;
for (int u = 0; u < sectionItems.count(); ++u) {
int count = sectionItems.at(u).tmpDataStreamSectionCount;
diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp
index a82d2a57b8..78be5af604 100644
--- a/src/widgets/styles/qstylesheetstyle.cpp
+++ b/src/widgets/styles/qstylesheetstyle.cpp
@@ -2492,7 +2492,7 @@ void QStyleSheetStyle::setProperties(QWidget *w)
QVector<int> finals; // indices in reverse order of each property's final occurrence
{
- // scan decls for final occurence of each "qproperty"
+ // scan decls for final occurrence of each "qproperty"
QSet<const QString> propertySet;
for (int i = decls.count() - 1; i >= 0; --i) {
const QString property = decls.at(i).d->property;
diff --git a/src/widgets/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp
index c35b761a20..4a1ce17cff 100644
--- a/src/widgets/widgets/qdockwidget.cpp
+++ b/src/widgets/widgets/qdockwidget.cpp
@@ -306,7 +306,7 @@ QSize QDockWidgetLayout::sizeFromContent(const QSize &content, bool floating) co
int left, top, right, bottom;
w->getContentsMargins(&left, &top, &right, &bottom);
- //we need to substract the contents margin (it will be added by the caller)
+ //we need to subtract the contents margin (it will be added by the caller)
QSize min = w->minimumSize() - QSize(left + right, top + bottom);
QSize max = w->maximumSize() - QSize(left + right, top + bottom);