From 449b8a93170ecc19f2f438b160d0bc4122999401 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Wed, 18 May 2011 14:39:44 +0200
Subject: QUiLoader, QAbstractFormBuilder: Introduce errorString().

Introduce errorString() to be able to obtain load errors
in Qt Designer. Remove automatic Qt 3 form conversion
from Qt Designer (since uic3 no longer exists) and move
all form load error checking logic including language
check into QAbstractFormBuilder.
Make language accessible in FormBuilderExtra in case
Jambi is revived.

Reviewed-by: hjk
---
 src/uitools/quiloader.cpp | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'src/uitools/quiloader.cpp')

diff --git a/src/uitools/quiloader.cpp b/src/uitools/quiloader.cpp
index 7f39b557ea..457c7ccd13 100644
--- a/src/uitools/quiloader.cpp
+++ b/src/uitools/quiloader.cpp
@@ -653,7 +653,7 @@ QUiLoader::~QUiLoader()
     Loads a form from the given \a device and creates a new widget with the
     given \a parentWidget to hold its contents.
 
-    \sa createWidget()
+    \sa createWidget(), errorString()
 */
 QWidget *QUiLoader::load(QIODevice *device, QWidget *parentWidget)
 {
@@ -936,6 +936,19 @@ bool QUiLoader::isTranslationEnabled() const
     return d->builder.trEnabled;
 }
 
+/*!
+    Returns a human-readable description of the last error occurred in load().
+
+    \since 5.0
+    \sa load()
+*/
+
+QString QUiLoader::errorString() const
+{
+    Q_D(const QUiLoader);
+    return d->builder.errorString();
+}
+
 QT_END_NAMESPACE
 
 #include "quiloader.moc"
-- 
cgit v1.2.3