summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-07-06 14:37:54 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-07-06 14:37:54 (GMT)
commitdbd6d9d6b46b37f13482dea9edfe40772a2aaab6 (patch)
tree9b7f4bdc58e778499e67172c992edf23bd7ca3a3 /src/gui
parent156893a247f1c24094129b6f5151c8b821d8b1b5 (diff)
parentb3e0d76d558d35e40f1c4f1b5b1b14ba79f8eef6 (diff)
downloadQt-dbd6d9d6b46b37f13482dea9edfe40772a2aaab6.zip
Qt-dbd6d9d6b46b37f13482dea9edfe40772a2aaab6.tar.gz
Qt-dbd6d9d6b46b37f13482dea9edfe40772a2aaab6.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: On symbian QMessageBox does not look like native dialog
Diffstat (limited to 'src/gui')
-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 6a1c04a..f18fe60 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);