Change Qt.application.layoutDirection from bool to correct type of Qt::LayoutDirection

Task-number: QTBUG-16424
Reviewed-by: Martin Jones

2 files changed, 13 insertions, 4 deletions

diff --git a/src/declarative/util/qdeclarativeapplication.cpp b/src/declarative/util/qdeclarativeapplication.cpp
index 7559aa9..7ecce1e 100644
--- a/src/declarative/util/qdeclarativeapplication.cpp
+++ b/src/declarative/util/qdeclarativeapplication.cpp
@@ -103,7 +103,7 @@ bool QDeclarativeApplication::active() const
 }
 
 /*!
-    \qmlproperty bool Application::layoutDirection
+    \qmlproperty enumeration Application::layoutDirection
 
     This property can be used to query the default layout direction of the
     application. On system start-up, the default layout direction depends on the
@@ -113,8 +113,17 @@ bool QDeclarativeApplication::active() const
     property to customize your application layouts to support both layout
     directions. This property is readonly.
 
+    Possible values are:
+
+    \list
+    \o Qt.LeftToRight - Text and graphics elements should be positioned
+                        from left to right.
+    \o Qt.RightToLeft - Text and graphics elements should be positioned
+                        from right to left.
+    \endlist
+
 */
-bool QDeclarativeApplication::layoutDirection() const
+Qt::LayoutDirection QDeclarativeApplication::layoutDirection() const
 {
     Q_D(const QDeclarativeApplication);
     return d->layoutDirection;
diff --git a/src/declarative/util/qdeclarativeapplication_p.h b/src/declarative/util/qdeclarativeapplication_p.h
index c5cd227..caaed18 100644
--- a/src/declarative/util/qdeclarativeapplication_p.h
+++ b/src/declarative/util/qdeclarativeapplication_p.h
@@ -57,13 +57,13 @@ class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeApplication : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(bool active READ active NOTIFY activeChanged)
-    Q_PROPERTY(bool layoutDirection READ layoutDirection NOTIFY layoutDirectionChanged)
+    Q_PROPERTY(Qt::LayoutDirection layoutDirection READ layoutDirection NOTIFY layoutDirectionChanged)
 
 public:
     explicit QDeclarativeApplication(QObject *parent = 0);
     virtual ~QDeclarativeApplication();
     bool active() const;
-    bool layoutDirection() const;
+    Qt::LayoutDirection layoutDirection() const;
 
 protected:
     bool eventFilter(QObject *obj, QEvent *event);