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

2 files changed, 16 insertions, 1 deletions

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"
diff --git a/src/uitools/quiloader.h b/src/uitools/quiloader.h
index 214342ef83..0c21a276ee 100644
--- a/src/uitools/quiloader.h
+++ b/src/uitools/quiloader.h
@@ -90,6 +90,8 @@ public:
     void setTranslationEnabled(bool enabled);
     bool isTranslationEnabled() const;
 
+    QString errorString() const;
+
 private:
     QScopedPointer<QUiLoaderPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QUiLoader)