summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems
diff options
context:
space:
mode:
authorJoona Petrell <joona.t.petrell@nokia.com>2011-03-04 06:50:02 (GMT)
committerJoona Petrell <joona.t.petrell@nokia.com>2011-03-04 07:02:23 (GMT)
commit86a0b3749a336181c241dd239c863f4ddbbd4ad2 (patch)
treefc7120212c3762bae74e53b02e7e4d8f3c0b475e /src/declarative/graphicsitems
parent7cdd849b50f0314d0eb227e1d0c92627f2be555b (diff)
downloadQt-86a0b3749a336181c241dd239c863f4ddbbd4ad2.zip
Qt-86a0b3749a336181c241dd239c863f4ddbbd4ad2.tar.gz
Qt-86a0b3749a336181c241dd239c863f4ddbbd4ad2.tar.bz2
Removal of text alignment layout direction dependency was missing couple of changes
Task-number: QTBUG-15880 Reviewed-by: Martin Jones Change-Id: I1ea87b05c483e5c9339fc47cf719c22d001ef52b
Diffstat (limited to 'src/declarative/graphicsitems')
-rw-r--r--src/declarative/graphicsitems/qdeclarativetext.cpp2
-rw-r--r--src/declarative/graphicsitems/qdeclarativetextedit.cpp3
-rw-r--r--src/declarative/graphicsitems/qdeclarativetextinput.cpp3
3 files changed, 0 insertions, 8 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetext.cpp b/src/declarative/graphicsitems/qdeclarativetext.cpp
index 890e481..e66a83e 100644
--- a/src/declarative/graphicsitems/qdeclarativetext.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetext.cpp
@@ -107,8 +107,6 @@ QDeclarativeTextPrivate::QDeclarativeTextPrivate()
cacheAllTextAsImage = enableImageCache();
QGraphicsItemPrivate::acceptedMouseButtons = Qt::LeftButton;
QGraphicsItemPrivate::flags = QGraphicsItemPrivate::flags & ~QGraphicsItem::ItemHasNoContents;
- if (QApplication::layoutDirection() == Qt::RightToLeft)
- hAlign = QDeclarativeText::AlignRight;
}
QTextDocumentWithImageResources::QTextDocumentWithImageResources(QDeclarativeText *parent)
diff --git a/src/declarative/graphicsitems/qdeclarativetextedit.cpp b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
index 78729aa..e4cd66c 100644
--- a/src/declarative/graphicsitems/qdeclarativetextedit.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
@@ -1512,9 +1512,6 @@ void QDeclarativeTextEditPrivate::init()
document->setDocumentMargin(textMargin);
document->setUndoRedoEnabled(false); // flush undo buffer.
document->setUndoRedoEnabled(true);
-
- if (QApplication::layoutDirection() == Qt::RightToLeft)
- hAlign = QDeclarativeTextEdit::AlignRight;
updateDefaultTextOption();
}
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index 670a6ea..0c021db 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
@@ -1827,9 +1827,6 @@ void QDeclarativeTextInputPrivate::init()
QPalette p = control->palette();
selectedTextColor = p.color(QPalette::HighlightedText);
selectionColor = p.color(QPalette::Highlight);
-
- if (QApplication::layoutDirection() == Qt::RightToLeft)
- hAlign = QDeclarativeTextInput::AlignRight;
}
void QDeclarativeTextInput::cursorPosChanged()