From bc4dcb6994160ca7cb3776d42d419299d854aed9 Mon Sep 17 00:00:00 2001 From: Konstantin Ritt Date: Sat, 16 Mar 2013 09:21:52 +0200 Subject: QLocale: Report textDirection() by looking to the locale script Change-Id: Ic562b0301271ba414d5d3ff75a308d84bd288f56 Reviewed-by: Thiago Macieira --- src/corelib/tools/qlocale.cpp | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) (limited to 'src/corelib/tools/qlocale.cpp') diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp index 21a01c4867..4aaa1af688 100644 --- a/src/corelib/tools/qlocale.cpp +++ b/src/corelib/tools/qlocale.cpp @@ -2458,20 +2458,27 @@ QLocale::MeasurementSystem QLocale::measurementSystem() const */ Qt::LayoutDirection QLocale::textDirection() const { - switch (language()) { - case QLocale::Arabic: - case QLocale::Hebrew: - case QLocale::Persian: - case QLocale::Pashto: - case QLocale::Urdu: - case QLocale::Syriac: - case QLocale::Divehi: + switch (script()) { + case QLocale::ArabicScript: + case QLocale::AvestanScript: + case QLocale::CypriotScript: + case QLocale::HebrewScript: + case QLocale::ImperialAramaicScript: + case QLocale::InscriptionalPahlaviScript: + case QLocale::InscriptionalParthianScript: + case QLocale::KharoshthiScript: + case QLocale::LydianScript: + case QLocale::MandaeanScript: + case QLocale::MeroiticCursiveScript: + case QLocale::MeroiticScript: + case QLocale::SamaritanScript: + case QLocale::SyriacScript: + case QLocale::ThaanaScript: + case QLocale::NkoScript: + case QLocale::OldSouthArabianScript: + case QLocale::OrkhonScript: + case QLocale::PhoenicianScript: return Qt::RightToLeft; - case QLocale::Punjabi: - case QLocale::Uzbek: - if (script() == QLocale::ArabicScript) - return Qt::RightToLeft; - // fall through default: break; } -- cgit v1.2.3