Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5

17 files changed, 170 insertions, 144 deletions

diff --git a/tools/designer/src/components/formeditor/formwindow_widgetstack.cpp b/tools/designer/src/components/formeditor/formwindow_widgetstack.cpp
index 7270628..58127b0 100644
--- a/tools/designer/src/components/formeditor/formwindow_widgetstack.cpp
+++ b/tools/designer/src/components/formeditor/formwindow_widgetstack.cpp
@@ -57,16 +57,20 @@ using namespace qdesigner_internal;
 FormWindowWidgetStack::FormWindowWidgetStack(QObject *parent) :
     QObject(parent),
     m_formContainer(new QWidget),
-    m_formContainerLayout(new QVBoxLayout),
+    m_formContainerLayout(new QStackedLayout),
     m_layout(new QStackedLayout)
 {
     m_layout->setMargin(0);
     m_layout->setSpacing(0);
     m_layout->setStackingMode(QStackedLayout::StackAll);
 
+    // We choose a QStackedLayout as immediate layout for
+    // the form windows as it ignores the sizePolicy of
+    // its child (for example, Fixed would cause undesired side effects).
     m_formContainerLayout->setMargin(0);
     m_formContainer->setObjectName(QLatin1String("formContainer"));
     m_formContainer->setLayout(m_formContainerLayout);
+    m_formContainerLayout->setStackingMode(QStackedLayout::StackAll);
     // System settings might have different background colors, autofill them
     // (affects for example mainwindow status bars)
     m_formContainer->setAutoFillBackground(true);
diff --git a/tools/designer/src/components/formeditor/formwindow_widgetstack.h b/tools/designer/src/components/formeditor/formwindow_widgetstack.h
index 92323c5..f21c4f0 100644
--- a/tools/designer/src/components/formeditor/formwindow_widgetstack.h
+++ b/tools/designer/src/components/formeditor/formwindow_widgetstack.h
@@ -51,7 +51,6 @@ QT_BEGIN_NAMESPACE
 class QDesignerFormWindowToolInterface;
 
 class QStackedLayout;
-class QVBoxLayout;
 class QWidget;
 
 namespace qdesigner_internal {
@@ -92,7 +91,7 @@ protected:
 private:
     QList<QDesignerFormWindowToolInterface*> m_tools;
     QWidget *m_formContainer;
-    QVBoxLayout *m_formContainerLayout;
+    QStackedLayout *m_formContainerLayout;
     QStackedLayout *m_layout;
 };
 
diff --git a/tools/designer/src/components/propertyeditor/designerpropertymanager.cpp b/tools/designer/src/components/propertyeditor/designerpropertymanager.cpp
index 1b267aa..346da18 100644
--- a/tools/designer/src/components/propertyeditor/designerpropertymanager.cpp
+++ b/tools/designer/src/components/propertyeditor/designerpropertymanager.cpp
@@ -271,7 +271,7 @@ void TextEditor::fileActionActivated()
     const QString newPath = m_core->dialogGui()->getOpenFileName(this, tr("Choose a File"), oldPath);
     if (newPath.isEmpty() || newPath == oldPath)
         return;
-    const QString newText = QLatin1String("file:") + newPath;
+    const QString newText = QUrl::fromLocalFile(newPath).toString();
     m_editor->setText(newText);
     emit textChanged(newText);
 }
diff --git a/tools/designer/src/components/propertyeditor/propertyeditor.cpp b/tools/designer/src/components/propertyeditor/propertyeditor.cpp
index 63b57d8..806e1dd 100644
--- a/tools/designer/src/components/propertyeditor/propertyeditor.cpp
+++ b/tools/designer/src/components/propertyeditor/propertyeditor.cpp
@@ -205,14 +205,15 @@ PropertyEditor::PropertyEditor(QDesignerFormEditorInterface *core, QWidget *pare
     colors.push_back(QColor(234, 191, 255));
     colors.push_back(QColor(255, 191, 239));
     m_colors.reserve(colors.count());
+    const int darknessFactor = 250;
     for (int i = 0; i < colors.count(); i++) {
         QColor c = colors.at(i);
-        m_colors.push_back(qMakePair(c, c.darker(150)));
+        m_colors.push_back(qMakePair(c, c.darker(darknessFactor)));
     }
     QColor dynamicColor(191, 207, 255);
     QColor layoutColor(255, 191, 191);
-    m_dynamicColor = qMakePair(dynamicColor, dynamicColor.darker(150));
-    m_layoutColor = qMakePair(layoutColor, layoutColor.darker(150));
+    m_dynamicColor = qMakePair(dynamicColor, dynamicColor.darker(darknessFactor));
+    m_layoutColor = qMakePair(layoutColor, layoutColor.darker(darknessFactor));
 
     updateForegroundBrightness();
 
diff --git a/tools/designer/src/designer/versiondialog.cpp b/tools/designer/src/designer/versiondialog.cpp
index a129a4d..c21912b 100644
--- a/tools/designer/src/designer/versiondialog.cpp
+++ b/tools/designer/src/designer/versiondialog.cpp
@@ -169,31 +169,11 @@ VersionDialog::VersionDialog(QWidget *parent)
     VersionLabel *label = new VersionLabel;
     QLabel *lbl = new QLabel;
     QString version = tr("<h3>%1</h3><br/><br/>Version %2");
-#if QT_EDITION == QT_EDITION_OPENSOURCE
-    QString open = tr(" Open Source Edition");
-    version.append(open);
-#endif
     version = version.arg(tr("Qt Designer")).arg(QLatin1String(QT_VERSION_STR));
     version.append(tr("<br/>Qt Designer is a graphical user interface designer for Qt applications.<br/>"));
 
-    QString edition =
-#if QT_EDITION == QT_EDITION_OPENSOURCE
-                    tr("This version of Qt Designer is part of the Qt Open Source Edition, for use "
-                    "in the development of Open Source applications. "
-                    "Qt is a comprehensive C++ framework for cross-platform application "
-                    "development.<br/><br/>"
-                    "You need a commercial Qt license for development of proprietary (closed "
-                    "source) applications. Please see <a href=\"http://qtsoftware.com/company/about/businessmodel\">http://qtsoftware.com/company/about/businessmodel"
-                    ".html</a> for an overview of Qt licensing.<br/>");
-#elif defined(QT_PRODUCT_LICENSE)
-                    tr("This program is licensed to you under the terms of the "
-                    "Qt %1 License Agreement. For details, see the license file "
-                    "that came with this software distribution.<br/>").arg(QT_PRODUCT_LICENSE);
-#else
-                    tr("This program is licensed to you under the terms of the "
-                    "Qt Commercial License Agreement. For details, see the file LICENSE "
-                    "that came with this software distribution.<br/>");
-#endif
+    // TODO: Remove this variable for 4.6.0.  Must keep this way for 4.5.x due to string freeze
+    QString edition;
 
     lbl->setText(tr("%1"
                     "<br/>%2"
diff --git a/tools/designer/src/lib/shared/actioneditor.cpp b/tools/designer/src/lib/shared/actioneditor.cpp
index 6a66442..7f96a15 100644
--- a/tools/designer/src/lib/shared/actioneditor.cpp
+++ b/tools/designer/src/lib/shared/actioneditor.cpp
@@ -456,7 +456,7 @@ void ActionEditor::slotNewAction()
         if (actionData.checkable)
             setInitialProperty(sheet, QLatin1String(checkablePropertyC), QVariant(true));
 
-        if (!actionData.keysequence.isEmpty())
+        if (!actionData.keysequence.value().isEmpty())
             setInitialProperty(sheet, QLatin1String(shortcutPropertyC), qVariantFromValue(actionData.keysequence));
 
         sheet->setProperty(sheet->indexOf(QLatin1String(iconPropertyC)), qVariantFromValue(actionData.icon));
@@ -491,10 +491,10 @@ static QDesignerFormWindowCommand *setIconPropertyCommand(const PropertySheetIco
 // return a FormWindow command to apply a QKeySequence or a reset command
 // in case it is empty.
 
-static QDesignerFormWindowCommand *setKeySequencePropertyCommand(const QKeySequence &ks, QAction *action, QDesignerFormWindowInterface *fw)
+static QDesignerFormWindowCommand *setKeySequencePropertyCommand(const PropertySheetKeySequenceValue &ks, QAction *action, QDesignerFormWindowInterface *fw)
 {
     const QString shortcutProperty = QLatin1String(shortcutPropertyC);
-    if (ks.isEmpty()) {
+    if (ks.value().isEmpty()) {
         ResetPropertyCommand *cmd = new ResetPropertyCommand(fw);
         cmd->init(action, shortcutProperty);
         return cmd;
@@ -544,7 +544,7 @@ void ActionEditor::editAction(QAction *action)
     oldActionData.text = action->text();
     oldActionData.toolTip = textPropertyValue(sheet, QLatin1String(toolTipPropertyC));
     oldActionData.icon = qVariantValue<PropertySheetIconValue>(sheet->property(sheet->indexOf(QLatin1String(iconPropertyC))));
-    oldActionData.keysequence = qVariantValue<QKeySequence>(sheet->property(sheet->indexOf(QLatin1String(shortcutPropertyC))));
+    oldActionData.keysequence = ActionModel::actionShortCut(sheet);
     oldActionData.checkable =  action->isCheckable();
     dlg.setActionData(oldActionData);
 
diff --git a/tools/designer/src/lib/shared/actionrepository.cpp b/tools/designer/src/lib/shared/actionrepository.cpp
index 941a9ba..1b638c3 100644
--- a/tools/designer/src/lib/shared/actionrepository.cpp
+++ b/tools/designer/src/lib/shared/actionrepository.cpp
@@ -42,6 +42,7 @@
 #include "actionrepository_p.h"
 #include "qtresourceview_p.h"
 #include "iconloader_p.h"
+#include "qdesigner_utils_p.h"
 
 #include <QtDesigner/QDesignerFormEditorInterface>
 #include <QtDesigner/QDesignerPropertySheetExtension>
@@ -168,16 +169,20 @@ QWidgetList ActionModel::associatedWidgets(const QAction *action)
 }
 
 // shortcut is a fake property, need to retrieve it via property sheet.
-static QString actionShortCut(QDesignerFormEditorInterface *core, QAction *action)
+PropertySheetKeySequenceValue ActionModel::actionShortCut(QDesignerFormEditorInterface *core, QAction *action)
 {
     QDesignerPropertySheetExtension *sheet = qt_extension<QDesignerPropertySheetExtension*>(core->extensionManager(), action);
     if (!sheet)
-        return QString();
+        return PropertySheetKeySequenceValue();
+    return actionShortCut(sheet);
+}
+
+PropertySheetKeySequenceValue ActionModel::actionShortCut(const QDesignerPropertySheetExtension *sheet)
+{
     const int index = sheet->indexOf(QLatin1String("shortcut"));
     if (index == -1)
-        return QString();
-    const QKeySequence keysequence = qvariant_cast<QKeySequence>(sheet->property(index));
-    return keysequence.toString();
+        return PropertySheetKeySequenceValue();
+    return qvariant_cast<PropertySheetKeySequenceValue>(sheet->property(index));
 }
 
 void  ActionModel::setItems(QDesignerFormEditorInterface *core, QAction *action, QStandardItemList &sl)
@@ -221,7 +226,7 @@ void  ActionModel::setItems(QDesignerFormEditorInterface *core, QAction *action,
     item->setText(action->text());
     item->setToolTip(action->text());
     // shortcut
-    const QString shortcut = actionShortCut(core, action);
+    const QString shortcut = actionShortCut(core, action).value().toString();
     item = sl[ShortCutColumn];
     item->setText(shortcut);
     item->setToolTip(shortcut);
diff --git a/tools/designer/src/lib/shared/actionrepository_p.h b/tools/designer/src/lib/shared/actionrepository_p.h
index 9d1af5a..66d77ce 100644
--- a/tools/designer/src/lib/shared/actionrepository_p.h
+++ b/tools/designer/src/lib/shared/actionrepository_p.h
@@ -65,9 +65,12 @@ QT_BEGIN_NAMESPACE
 class QPixmap;
 
 class QDesignerFormEditorInterface;
+class QDesignerPropertySheetExtension;
 
 namespace qdesigner_internal {
 
+class PropertySheetKeySequenceValue;
+
 // Shared model of actions, to be used for several views (detailed/icon view).
 class QDESIGNER_SHARED_EXPORT ActionModel: public QStandardItemModel
 {
@@ -99,6 +102,10 @@ public:
     // Find the associated menus and toolbars, ignore toolbuttons
     static QWidgetList associatedWidgets(const QAction *action);
 
+    // Retrieve shortcut via property sheet as it is a fake property
+    static PropertySheetKeySequenceValue actionShortCut(QDesignerFormEditorInterface *core, QAction *action);
+    static PropertySheetKeySequenceValue actionShortCut(const QDesignerPropertySheetExtension *ps);
+
 signals:
     void resourceImageDropped(const QString &path, QAction *action);
 
diff --git a/tools/designer/src/lib/shared/formwindowbase.cpp b/tools/designer/src/lib/shared/formwindowbase.cpp
index 3e7e17b..b569b51 100644
--- a/tools/designer/src/lib/shared/formwindowbase.cpp
+++ b/tools/designer/src/lib/shared/formwindowbase.cpp
@@ -55,7 +55,7 @@ TRANSLATOR qdesigner_internal::FormWindowBase
 #include "deviceprofile_p.h"
 #include "qdesigner_utils_p.h"
 
-#include <abstractformbuilder.h>
+#include "qsimpleresource_p.h"
 
 #include <QtDesigner/QDesignerFormEditorInterface>
 #include <QtDesigner/QDesignerContainerExtension>
@@ -482,6 +482,14 @@ void FormWindowBase::setupDefaultAction(QDesignerFormWindowInterface *fw)
     QObject::connect(fw, SIGNAL(activated(QWidget*)), fw, SLOT(triggerDefaultAction(QWidget*)));
 }
 
+QString FormWindowBase::fileContents() const
+{
+    const bool oldValue = QSimpleResource::setWarningsEnabled(false);
+    const QString rc = contents();
+    QSimpleResource::setWarningsEnabled(oldValue);
+    return rc;
+}
+
 } // namespace qdesigner_internal
 
 QT_END_NAMESPACE
diff --git a/tools/designer/src/lib/shared/formwindowbase_p.h b/tools/designer/src/lib/shared/formwindowbase_p.h
index 68e977e..0891f6e 100644
--- a/tools/designer/src/lib/shared/formwindowbase_p.h
+++ b/tools/designer/src/lib/shared/formwindowbase_p.h
@@ -90,6 +90,9 @@ public:
     QVariantMap formData();
     void setFormData(const QVariantMap &vm);
 
+    // Return contents without warnings. Should be 'contents(bool quiet)'
+    QString fileContents() const;
+
     // Return the widget containing the form. This is used to
     // apply embedded design settings to that are inherited (for example font).
     // These are meant to be applied to the form only and not to the other editors
diff --git a/tools/designer/src/lib/shared/newactiondialog.cpp b/tools/designer/src/lib/shared/newactiondialog.cpp
index 53aec4b..bb163d6 100644
--- a/tools/designer/src/lib/shared/newactiondialog.cpp
+++ b/tools/designer/src/lib/shared/newactiondialog.cpp
@@ -134,7 +134,7 @@ ActionData NewActionDialog::actionData() const
     rc.toolTip = m_ui->tooltipEditor->text();
     rc.icon = m_ui->iconSelector->icon();
     rc.checkable = m_ui->checkableCheckBox->checkState() == Qt::Checked;
-    rc.keysequence = m_ui->keySequenceEdit->keySequence();
+    rc.keysequence = PropertySheetKeySequenceValue(m_ui->keySequenceEdit->keySequence());
     return rc;
 }
 
@@ -144,7 +144,7 @@ void NewActionDialog::setActionData(const ActionData &d)
     m_ui->editObjectName->setText(d.name);
     m_ui->iconSelector->setIcon(d.icon);
     m_ui->tooltipEditor->setText(d.toolTip);
-    m_ui->keySequenceEdit->setKeySequence(d.keysequence);
+    m_ui->keySequenceEdit->setKeySequence(d.keysequence.value());
     m_ui->checkableCheckBox->setCheckState(d.checkable ? Qt::Checked : Qt::Unchecked);
 
     m_auto_update_object_name = false;
diff --git a/tools/designer/src/lib/shared/newactiondialog_p.h b/tools/designer/src/lib/shared/newactiondialog_p.h
index c8bd34c..d4e9b5b 100644
--- a/tools/designer/src/lib/shared/newactiondialog_p.h
+++ b/tools/designer/src/lib/shared/newactiondialog_p.h
@@ -84,7 +84,7 @@ struct ActionData {
     QString toolTip;
     PropertySheetIconValue icon;
     bool checkable;
-    QKeySequence keysequence;
+    PropertySheetKeySequenceValue keysequence;
 };
 
 inline bool operator==(const ActionData &a1, const ActionData &a2) {  return a1.compare(a2) == 0u; }
diff --git a/tools/designer/src/lib/shared/qdesigner_propertycommand.cpp b/tools/designer/src/lib/shared/qdesigner_propertycommand.cpp
index ff3b50b..94e8044 100644
--- a/tools/designer/src/lib/shared/qdesigner_propertycommand.cpp
+++ b/tools/designer/src/lib/shared/qdesigner_propertycommand.cpp
@@ -316,6 +316,10 @@ Qt::Alignment variantToAlignment(const QVariant & q)
 // find changed subproperties of a variant
 unsigned compareSubProperties(const QVariant & q1, const QVariant & q2, qdesigner_internal::SpecialProperty specialProperty)
 {
+    // Do not clobber new value in the comparison function in
+    // case someone sets a QString on a PropertySheetStringValue.
+    if (q1.type() != q2.type())
+        return SubPropertyAll;
     switch (q1.type()) {
     case QVariant::Rect:
         return compareSubProperties(q1.toRect(), q2.toRect());
diff --git a/tools/designer/src/lib/shared/qdesigner_utils.cpp b/tools/designer/src/lib/shared/qdesigner_utils.cpp
index d2f092e..75fa180 100644
--- a/tools/designer/src/lib/shared/qdesigner_utils.cpp
+++ b/tools/designer/src/lib/shared/qdesigner_utils.cpp
@@ -397,7 +397,7 @@ namespace qdesigner_internal
         QMapIterator<QPair<QIcon::Mode, QIcon::State>, PropertySheetPixmapValue> itPath(paths);
         while (itPath.hasNext()) {
             QPair<QIcon::Mode, QIcon::State> pair = itPath.next().key();
-            icon.addPixmap(m_pixmapCache->pixmap(itPath.value()), pair.first, pair.second);
+            icon.addFile(itPath.value().path(), QSize(), pair.first, pair.second);
         }
         m_cache.insert(value, icon);
         return icon;
diff --git a/tools/designer/src/lib/uilib/resourcebuilder.cpp b/tools/designer/src/lib/uilib/resourcebuilder.cpp
index 3679f92..5df10e9 100644
--- a/tools/designer/src/lib/uilib/resourcebuilder.cpp
+++ b/tools/designer/src/lib/uilib/resourcebuilder.cpp
@@ -98,21 +98,21 @@ QVariant QResourceBuilder::loadResource(const QDir &workingDirectory, const DomP
             if (const int flags = iconStateFlags(dpi)) { // new, post 4.4 format
                 QIcon icon;
                 if (flags & NormalOff)
-                    icon.addPixmap(QFileInfo(workingDirectory, dpi->elementNormalOff()->text()).absoluteFilePath(), QIcon::Normal, QIcon::Off);
+                    icon.addFile(QFileInfo(workingDirectory, dpi->elementNormalOff()->text()).absoluteFilePath(), QSize(), QIcon::Normal, QIcon::Off);
                 if (flags & NormalOn)
-                    icon.addPixmap(QFileInfo(workingDirectory, dpi->elementNormalOn()->text()).absoluteFilePath(), QIcon::Normal, QIcon::On);
+                    icon.addFile(QFileInfo(workingDirectory, dpi->elementNormalOn()->text()).absoluteFilePath(), QSize(), QIcon::Normal, QIcon::On);
                 if (flags & DisabledOff)
-                    icon.addPixmap(QFileInfo(workingDirectory, dpi->elementDisabledOff()->text()).absoluteFilePath(), QIcon::Disabled, QIcon::Off);
+                    icon.addFile(QFileInfo(workingDirectory, dpi->elementDisabledOff()->text()).absoluteFilePath(), QSize(), QIcon::Disabled, QIcon::Off);
                 if (flags & DisabledOn)
-                    icon.addPixmap(QFileInfo(workingDirectory, dpi->elementDisabledOn()->text()).absoluteFilePath(), QIcon::Disabled, QIcon::On);
+                    icon.addFile(QFileInfo(workingDirectory, dpi->elementDisabledOn()->text()).absoluteFilePath(), QSize(), QIcon::Disabled, QIcon::On);
                 if (flags & ActiveOff)
-                    icon.addPixmap(QFileInfo(workingDirectory, dpi->elementActiveOff()->text()).absoluteFilePath(), QIcon::Active, QIcon::Off);
+                    icon.addFile(QFileInfo(workingDirectory, dpi->elementActiveOff()->text()).absoluteFilePath(), QSize(), QIcon::Active, QIcon::Off);
                 if (flags & ActiveOn)
-                    icon.addPixmap(QFileInfo(workingDirectory, dpi->elementActiveOn()->text()).absoluteFilePath(), QIcon::Active, QIcon::On);
+                    icon.addFile(QFileInfo(workingDirectory, dpi->elementActiveOn()->text()).absoluteFilePath(), QSize(), QIcon::Active, QIcon::On);
                 if (flags & SelectedOff)
-                    icon.addPixmap(QFileInfo(workingDirectory, dpi->elementSelectedOff()->text()).absoluteFilePath(), QIcon::Selected, QIcon::Off);
+                    icon.addFile(QFileInfo(workingDirectory, dpi->elementSelectedOff()->text()).absoluteFilePath(), QSize(), QIcon::Selected, QIcon::Off);
                 if (flags & SelectedOn)
-                    icon.addPixmap(QFileInfo(workingDirectory, dpi->elementSelectedOn()->text()).absoluteFilePath(), QIcon::Selected, QIcon::On);
+                    icon.addFile(QFileInfo(workingDirectory, dpi->elementSelectedOn()->text()).absoluteFilePath(), QSize(), QIcon::Selected, QIcon::On);
                 return qVariantFromValue(icon);
             } else { // 4.3 legacy
                 const QIcon icon(QFileInfo(workingDirectory, dpi->text()).absoluteFilePath());
diff --git a/tools/designer/src/uitools/quiloader.cpp b/tools/designer/src/uitools/quiloader.cpp
index d3d1d54..2a66095 100644
--- a/tools/designer/src/uitools/quiloader.cpp
+++ b/tools/designer/src/uitools/quiloader.cpp
@@ -259,9 +259,9 @@ public:
                 const int row_cnt = tablew->rowCount();
                 const int col_cnt = tablew->columnCount();
                 for (int j = 0; j < col_cnt; ++j)
-                    reTranslateTableItem(tablew->verticalHeaderItem(j), m_className);
+                    reTranslateTableItem(tablew->horizontalHeaderItem(j), m_className);
                 for (int i = 0; i < row_cnt; ++i) {
-                    reTranslateTableItem(tablew->horizontalHeaderItem(i), m_className);
+                    reTranslateTableItem(tablew->verticalHeaderItem(i), m_className);
                     for (int j = 0; j < col_cnt; ++j)
                         reTranslateTableItem(tablew->item(i, j), m_className);
                 }
@@ -572,53 +572,52 @@ void QUiLoaderPrivate::setupWidgetMap() const
     \class QUiLoader
     \inmodule QtUiTools
 
-    \brief The QUiLoader class allows standalone applications dynamically
-    create user interfaces at run-time using the information stored in
-    .ui files or specified plugin paths.
+    \brief The QUiLoader class enables standalone applications to
+    dynamically create user interfaces at run-time using the
+    information stored in .ui files or specified in plugin paths.
 
-    In addition, you can customize of creating an user interface by
+    In addition, you can customize or create your own user interface by
     deriving your own loader class.
 
-    If you have a custom component or an application that embeds Qt
-    Designer, you can also use the QFormBuilder class provided by the
-    QtDesigner module to create user interfaces from .ui files.
+    If you have a custom component or an application that embeds \QD, you can
+    also use the QFormBuilder class provided by the QtDesigner module to create
+    user interfaces from \c{.ui} files.
 
-    The QUiLoader class provides a collection of functions that allows
-    you to create widgets based on the information stored in \c .ui
-    files (created with Qt Designer) or available in the specified
-    plugin paths. The specified plugin paths can be retrieved using
-    the pluginPaths() function. You can retrieve the contents of an \c
-    .ui file using the load() function. For example:
+    The QUiLoader class provides a collection of functions allowing you to
+    create widgets based on the information stored in \c .ui files (created
+    with \QD) or available in the specified plugin paths. The specified plugin
+    paths can be retrieved using the pluginPaths() function. Similarly, the
+    contents of a \c{.ui} file  can be retrieved using the load() function. For
+    example:
 
     \snippet doc/src/snippets/quiloader/mywidget.cpp 0
 
-    By including the user interface in the form's resources (\c myform.qrc),
-    we ensure that it will be present at run-time:
+    By including the user interface in the form's resources (\c myform.qrc), we
+    ensure that it will be present at run-time:
 
     \quotefile doc/src/snippets/quiloader/mywidget.qrc
 
-    The availableWidgets() function returns a QStringList with the
-    class names of the widgets available in the specified plugin
-    paths. You can create any of these widgets using the
-    createWidget() function. For example:
+    The availableWidgets() function returns a QStringList with the class names
+    of the widgets available in the specified plugin paths. To create these
+    widgets, simply use the createWidget() function. For example:
 
     \snippet doc/src/snippets/quiloader/main.cpp 0
 
-    You can make a custom widget available to the loader using the
-    addPluginPath() function, and you can remove all the available widgets
-    by calling the clearPluginPaths() function.
+    To make a custom widget available to the loader, you can use the
+    addPluginPath() function; to remove all available widgets, you can call
+    the clearPluginPaths() function.
 
-    The createAction(), createActionGroup(), createLayout() and
-    createWidget() functions are used internally by the QUiLoader class
-    whenever it has to create an action, action group, layout or
-    widget respectively. For that reason, you can subclass the QUiLoader
-    class and reimplement these functions to intervene the process of
-    constructing an user interface. For example, you might want to
-    create a list of the actions created when loading a form or
-    creating a custom widget.
+    The createAction(), createActionGroup(), createLayout(), and createWidget()
+    functions are used internally by the QUiLoader class whenever it has to
+    create an action, action group, layout, or widget respectively. For that
+    reason, you can subclass the QUiLoader class and reimplement these
+    functions to intervene the process of constructing a user interface. For
+    example, you might want to have a list of the actions created when loading
+    a form or creating a custom widget. However, in your reimplementation, you
+    must call QUiLoader's original implementation of these functions first.
 
-    For a complete example using the QUiLoader class, see the \l
-    {designer/calculatorbuilder}{Calculator Builder} example.
+    For a complete example using the QUiLoader class, see the
+    \l{Calculator Builder Example}.
 
     \sa QtUiTools, QFormBuilder
 */
@@ -653,8 +652,8 @@ QUiLoader::~QUiLoader()
 }
 
 /*!
-    Loads a form from the given \a device and creates a new widget with the given
-    \a parentWidget to hold its contents.
+    Loads a form from the given \a device and creates a new widget with the
+    given \a parentWidget to hold its contents.
 
     \sa createWidget()
 */
@@ -668,8 +667,8 @@ QWidget *QUiLoader::load(QIODevice *device, QWidget *parentWidget)
 }
 
 /*!
-    Returns a list naming the paths the loader searches when locating
-    custom widget plugins.
+    Returns a list naming the paths in which the loader will search when
+    locating custom widget plugins.
 
     \sa addPluginPath(), clearPluginPaths()
 */
@@ -680,7 +679,7 @@ QStringList QUiLoader::pluginPaths() const
 }
 
 /*!
-    Clears the list of paths the loader searches when locating
+    Clears the list of paths in which the loader will search when locating
     plugins.
 
     \sa addPluginPath(), pluginPaths()
@@ -692,7 +691,7 @@ void QUiLoader::clearPluginPaths()
 }
 
 /*!
-    Adds the given \a path to the list of paths the loader searches
+    Adds the given \a path to the list of paths in which the loader will search
     when locating plugins.
 
     \sa pluginPaths(), clearPluginPaths()
@@ -704,17 +703,17 @@ void QUiLoader::addPluginPath(const QString &path)
 }
 
 /*!
-  Creates a new widget with the given \a parent and \a name
-  using the class specified by \a className. You can use this
-  function to create any of the widgets returned by the
-  availableWidgets() function.
+    Creates a new widget with the given \a parent and \a name using the class
+    specified by \a className. You can use this function to create any of the
+    widgets returned by the availableWidgets() function.
 
-  The function is also used internally by the QUiLoader class whenever
-  it has to create a widget. For that reason, you can subclass the
-  QUiLoader class and reimplement this function to intervene in the
-  process of constructing a user interface or widget.
+    The function is also used internally by the QUiLoader class whenever it
+    creates a widget. Hence, you can subclass QUiLoader and reimplement this
+    function to intervene process of constructing a user interface or widget.
+    However, in your implementation, ensure that you call QUiLoader's version
+    first.
 
-  \sa availableWidgets(), load()
+    \sa availableWidgets(), load()
 */
 QWidget *QUiLoader::createWidget(const QString &className, QWidget *parent, const QString &name)
 {
@@ -723,13 +722,14 @@ QWidget *QUiLoader::createWidget(const QString &className, QWidget *parent, cons
 }
 
 /*!
-    Creates a new layout with the given \a parent and \a name
-    using the class specified by \a className.
+    Creates a new layout with the given \a parent and \a name using the class
+    specified by \a className.
 
-    The function is used internally by the QUiLoader class whenever it
-    has to create a layout. For that reason, you can subclass the
-    QUiLoader class and reimplement this function to intervene the
-    process of constructing an user interface or widget.
+    The function is also used internally by the QUiLoader class whenever it
+    creates a widget. Hence, you can subclass QUiLoader and reimplement this
+    function to intervene process of constructing a user interface or widget.
+    However, in your implementation, ensure that you call QUiLoader's version
+    first.
 
     \sa createWidget(), load()
 */
@@ -742,10 +742,11 @@ QLayout *QUiLoader::createLayout(const QString &className, QObject *parent, cons
 /*!
     Creates a new action group with the given \a parent and \a name.
 
-    The function is used internally by the QUiLoader class whenever it
-    has to create an action group. For that reason, you can subclass
-    the QUiLoader class and reimplement this function to intervene the
-    process of constructing an user interface or widget.
+    The function is also used internally by the QUiLoader class whenever it
+    creates a widget. Hence, you can subclass QUiLoader and reimplement this
+    function to intervene process of constructing a user interface or widget.
+    However, in your implementation, ensure that you call QUiLoader's version
+    first.
 
     \sa createAction(), createWidget(), load()
  */
@@ -758,10 +759,11 @@ QActionGroup *QUiLoader::createActionGroup(QObject *parent, const QString &name)
 /*!
     Creates a new action with the given \a parent and \a name.
 
-    The function is used internally by the QUiLoader class whenever it
-    has to create an action. For that reason, you can subclass the
-    QUiLoader class and reimplement this function to intervene the
-    process of constructing an user interface or widget.
+    The function is also used internally by the QUiLoader class whenever it
+    creates a widget. Hence, you can subclass QUiLoader and reimplement this
+    function to intervene process of constructing a user interface or widget.
+    However, in your implementation, ensure that you call QUiLoader's version
+    first.
 
     \sa createActionGroup(), createWidget(), load()
 */
@@ -772,9 +774,9 @@ QAction *QUiLoader::createAction(QObject *parent, const QString &name)
 }
 
 /*!
-    Returns a list naming the available widgets that can be built
-    using the createWidget() function, i.e all the widgets specified
-    within the given plugin paths.
+    Returns a list naming all available widgets that can be built using the
+    createWidget() function, i.e all the widgets specified within the given
+    plugin paths.
 
     \sa pluginPaths(), createWidget()
 
@@ -795,11 +797,11 @@ QStringList QUiLoader::availableWidgets() const
 
 
 /*!
-    Returns a list naming the available layouts that can be built
-    using the createLayout() function
+    \since 4.5
+    Returns a list naming all available layouts that can be built using the
+    createLayout() function
 
     \sa createLayout()
-    \since 4.5
 */
 
 QStringList QUiLoader::availableLayouts() const
@@ -816,9 +818,9 @@ QStringList QUiLoader::availableLayouts() const
 }
 
 /*!
-    Sets the working directory of the loader to \a dir. The loader
-    looks for other resources, such as icons and resource files,
-    in paths relative to this directory.
+    Sets the working directory of the loader to \a dir. The loader will look
+    for other resources, such as icons and resource files, in paths relative to
+    this directory.
 
     \sa workingDirectory()
 */
@@ -842,9 +844,13 @@ QDir QUiLoader::workingDirectory() const
 }
 
 /*!
-    Sets whether the execution of scripts is enabled to \a enabled.
-    \since 4.3
     \internal
+    \since 4.3
+
+    If \a enabled is true, the loader will be able to execute scripts.
+    Otherwise, execution of scripts will be disabled.
+
+    \sa isScriptingEnabled()
 */
 
 void QUiLoader::setScriptingEnabled(bool enabled)
@@ -854,10 +860,12 @@ void QUiLoader::setScriptingEnabled(bool enabled)
 }
 
 /*!
-   Returns whether the execution of scripts is enabled.
-   \sa setScriptingEnabled()
-   \since 4.3
-   \internal
+    \internal
+    \since 4.3
+
+    Returns true if execution of scripts is enabled; returns false otherwise.
+
+    \sa setScriptingEnabled()
 */
 
 bool QUiLoader::isScriptingEnabled() const
@@ -867,11 +875,13 @@ bool QUiLoader::isScriptingEnabled() const
 }
 
 /*!
-    Sets whether user interfaces loaded by this loader automatically
-    retranslate themselves upon receiving a language change event or not,
-    depending on \a enabled.
-
     \since 4.5
+
+    If \a enabled is true, user interfaces loaded by this loader will
+    automatically retranslate themselves upon receiving a language change
+    event. Otherwise, the user interfaces will not be retranslated.
+
+    \sa isLanguageChangeEnabled()
 */
 
 void QUiLoader::setLanguageChangeEnabled(bool enabled)
@@ -881,9 +891,12 @@ void QUiLoader::setLanguageChangeEnabled(bool enabled)
 }
 
 /*!
-   Returns whether dynamic retranslation on language change is enabled.
-   \sa setLanguageChangeEnabled()
-   \since 4.5
+    \since 4.5
+
+    Returns true if dynamic retranslation on language change is enabled;
+    returns false otherwise.
+
+    \sa setLanguageChangeEnabled()
 */
 
 bool QUiLoader::isLanguageChangeEnabled() const
@@ -894,11 +907,14 @@ bool QUiLoader::isLanguageChangeEnabled() const
 
 /*!
     \internal
+    \since 4.5
 
-    Sets whether user interfaces loaded by this loader are translated
-    at all. Note that this is orthogonal to languageChangeEnabled.
+    If \a enabled is true, user interfaces loaded by this loader will be
+    translated. Otherwise, the user interfaces will not be translated.
 
-    \since 4.5
+    \note This is orthogonal to languageChangeEnabled.
+
+    \sa isLanguageChangeEnabled(), setLanguageChangeEnabled()
 */
 
 void QUiLoader::setTranslationEnabled(bool enabled)
@@ -909,11 +925,11 @@ void QUiLoader::setTranslationEnabled(bool enabled)
 
 /*!
     \internal
+    \since 4.5
 
-    Returns whether translation is enabled.
-    \sa setTranslationEnabled()
+    Returns true if translation is enabled; returns false otherwise.
 
-    \since 4.5
+    \sa setTranslationEnabled()
 */
 
 bool QUiLoader::isTranslationEnabled() const
diff --git a/tools/designer/translations/translations.pro b/tools/designer/translations/translations.pro
index 7294956..8395259 100644
--- a/tools/designer/translations/translations.pro
+++ b/tools/designer/translations/translations.pro
@@ -133,7 +133,6 @@ HEADERS += ../../shared/findwidget/abstractfindwidget.h \
 TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/designer_de.ts \
              $$[QT_INSTALL_TRANSLATIONS]/designer_ja.ts \
              $$[QT_INSTALL_TRANSLATIONS]/designer_pl.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/designer_tr_TR.ts \
              $$[QT_INSTALL_TRANSLATIONS]/designer_zh_CN.ts \
              $$[QT_INSTALL_TRANSLATIONS]/designer_zh_TW.ts \
              $$[QT_INSTALL_TRANSLATIONS]/designer_untranslated.ts