summaryrefslogtreecommitdiffstats
path: root/src/gui/dialogs
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-07-08 02:06:16 +1000
committerQt Continuous Integration System <qt-info@nokia.com>2011-07-08 02:06:16 +1000
commit4f8978312a8897e27b2e548fe85f2a76402aa17a (patch)
tree47bbd865ea2d4603b271f01a8c9f1aac1c19e9c1 /src/gui/dialogs
parent8bc5a6319455d7dc0655a8c48862ada8890b0064 (diff)
parent1fc2dcd798cf984d59568c1f681c830ce16bda1e (diff)
Merge branch 4.7 into qt-4.8-from-4.7
Diffstat (limited to 'src/gui/dialogs')
-rw-r--r--src/gui/dialogs/qmessagebox.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/gui/dialogs/qmessagebox.cpp b/src/gui/dialogs/qmessagebox.cpp
index c3a10841d7..a2f086b80a 100644
--- a/src/gui/dialogs/qmessagebox.cpp
+++ b/src/gui/dialogs/qmessagebox.cpp
@@ -2507,7 +2507,12 @@ void QMessageBox::setInformativeText(const QString &text)
label->hide();
QTextBrowser *textBrowser = new QTextBrowser(this);
textBrowser->setOpenExternalLinks(true);
- grid->addWidget(textBrowser, 1, 1, 1, 1);
+#if defined(Q_OS_SYMBIAN)
+ const int preferredTextColumn = (QApplication::layoutDirection() == Qt::LeftToRight) ? 0 : 1;
+#else
+ const int preferredTextColumn = 1;
+#endif
+ grid->addWidget(textBrowser, 1, preferredTextColumn, 1, 1);
d->textBrowser = textBrowser;
#else
grid->addWidget(label, 1, 1, 1, 1);