From 159713de3b00db199ccf08de23f93a5297491f5c Mon Sep 17 00:00:00 2001 From: Konstantin Ritt Date: Mon, 10 Dec 2012 12:34:29 +0200 Subject: QLocale: Report RTL text direction for pa_Arab and uz_Arab Change-Id: I97c785c9cbf550ef1ab330a4905ff7ae97ee6a30 Reviewed-by: Lars Knoll --- src/corelib/tools/qlocale.cpp | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp index 4b4c94872e..582ae9ebef 100644 --- a/src/corelib/tools/qlocale.cpp +++ b/src/corelib/tools/qlocale.cpp @@ -2240,16 +2240,23 @@ QLocale::MeasurementSystem QLocale::measurementSystem() const */ Qt::LayoutDirection QLocale::textDirection() const { - Language lang = language(); - if (lang == QLocale::Arabic || - lang == QLocale::Hebrew || - lang == QLocale::Persian || - lang == QLocale::Pashto || - lang == QLocale::Urdu || - lang == QLocale::Syriac || - lang == QLocale::Divehi) + switch (language()) { + case QLocale::Arabic: + case QLocale::Hebrew: + case QLocale::Persian: + case QLocale::Pashto: + case QLocale::Urdu: + case QLocale::Syriac: + case QLocale::Divehi: return Qt::RightToLeft; - + case QLocale::Punjabi: + case QLocale::Uzbek: + if (script() == QLocale::ArabicScript) + return Qt::RightToLeft; + // fall through + default: + break; + } return Qt::LeftToRight; } -- cgit v1.2.3