summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Arve Saether <jan-arve.saether@digia.com>2013-04-03 10:01:13 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-04-03 14:44:45 +0200
commit73b217015c274e20225f3cd0f7bbb7225b3f201f (patch)
tree9f6094700d91c5a18070d8b1fd6de2caa11d007a
parent37bf0fd6aac9062320dc1a479aa4f3a513dfeb0c (diff)
Change the default horizontal alignment from center to left alignedv5.1.0-alpha1
Only the vertical alignment will be centered. (This should probably change to baseline once we support that). Change-Id: I1993821ff2d63f4bcc9408b54d20c9b353693df3 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
-rw-r--r--src/layouts/qgridlayoutengine.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/layouts/qgridlayoutengine.cpp b/src/layouts/qgridlayoutengine.cpp
index 30c02c978..c5a1b5ce6 100644
--- a/src/layouts/qgridlayoutengine.cpp
+++ b/src/layouts/qgridlayoutengine.cpp
@@ -943,8 +943,6 @@ Qt::Alignment QGridLayoutEngine::effectiveAlignment(const QGridLayoutItem *layou
// no horizontal alignment, respect the column alignment
int x = layoutItem->firstColumn();
align |= (rowAlignment(x, Qt::Horizontal) & Qt::AlignHorizontal_Mask);
- if (!(align & Qt::AlignHorizontal_Mask))
- align |= Qt::AlignHCenter;
}
return align;