Merge commit 'qt/master-stable' into 4.6-stable

Bring Qt 4.6 into the Qt-S60 repo.

Conflicts:
	configure.exe
	mkspecs/features/qttest_p4.prf
	qmake/generators/makefile.cpp
	src/corelib/io/qdir.cpp
	src/corelib/io/qprocess.h
	src/corelib/kernel/qcoreevent.h
	src/corelib/kernel/qobject.cpp
	src/corelib/kernel/qsharedmemory_unix.cpp
	src/corelib/thread/qthread_p.h
	src/corelib/tools/qvector.h
	src/gui/dialogs/qdialog.cpp
	src/gui/dialogs/qfiledialog.cpp
	src/gui/dialogs/qfiledialog_p.h
	src/gui/dialogs/qmessagebox.cpp
	src/gui/graphicsview/qgraphicsitem.cpp
	src/gui/graphicsview/qgraphicsview.cpp
	src/gui/image/qpixmapcache.cpp
	src/gui/kernel/qapplication.cpp
	src/gui/kernel/qapplication_p.h
	src/gui/kernel/qwidget.cpp
	src/gui/kernel/qwidget_p.h
	src/gui/painting/qdrawhelper.cpp
	src/gui/painting/qpaintengine_raster.cpp
	src/gui/text/qfontengine_qpf.cpp
	src/gui/widgets/qmenubar.cpp
	src/network/socket/qlocalserver.cpp
	src/testlib/qtestcase.cpp
	src/testlib/testlib.pro
	tests/auto/qimagereader/tst_qimagereader.cpp
	tests/auto/qitemdelegate/tst_qitemdelegate.cpp
	tests/auto/qnetworkreply/tst_qnetworkreply.cpp
	tests/auto/qpixmap/qpixmap.pro

38 files changed, 10 insertions, 272 deletions

diff --git a/tools/designer/src/components/buddyeditor/buddyeditor.cpp b/tools/designer/src/components/buddyeditor/buddyeditor.cpp
index f5c93fa..43348d2 100644
--- a/tools/designer/src/components/buddyeditor/buddyeditor.cpp
+++ b/tools/designer/src/components/buddyeditor/buddyeditor.cpp
@@ -39,10 +39,6 @@
 **
 ****************************************************************************/
 
-/*
-TRANSLATOR qdesigner_internal::BuddyEditor
-*/
-
 #include "buddyeditor.h"
 
 #include <QtDesigner/QDesignerFormWindowInterface>
diff --git a/tools/designer/src/components/buddyeditor/buddyeditor_plugin.cpp b/tools/designer/src/components/buddyeditor/buddyeditor_plugin.cpp
index 98fff8c..9319916 100644
--- a/tools/designer/src/components/buddyeditor/buddyeditor_plugin.cpp
+++ b/tools/designer/src/components/buddyeditor/buddyeditor_plugin.cpp
@@ -39,10 +39,6 @@
 **
 ****************************************************************************/
 
-/*
-TRANSLATOR qdesigner_internal::BuddyEditorPlugin
-*/
-
 #include <QtGui/QAction>
 
 #include "buddyeditor_plugin.h"
diff --git a/tools/designer/src/components/buddyeditor/buddyeditor_tool.cpp b/tools/designer/src/components/buddyeditor/buddyeditor_tool.cpp
index 68a6030..cf7f250 100644
--- a/tools/designer/src/components/buddyeditor/buddyeditor_tool.cpp
+++ b/tools/designer/src/components/buddyeditor/buddyeditor_tool.cpp
@@ -39,10 +39,6 @@
 **
 ****************************************************************************/
 
-/*
-TRANSLATOR qdesigner_internal::BuddyEditorTool
-*/
-
 #include "buddyeditor_tool.h"
 #include "buddyeditor.h"
 
diff --git a/tools/designer/src/components/formeditor/embeddedoptionspage.cpp b/tools/designer/src/components/formeditor/embeddedoptionspage.cpp
index bf3f3f1..1a41985 100644
--- a/tools/designer/src/components/formeditor/embeddedoptionspage.cpp
+++ b/tools/designer/src/components/formeditor/embeddedoptionspage.cpp
@@ -39,10 +39,6 @@
 **
 ****************************************************************************/
 
-/*
-TRANSLATOR qdesigner_internal::EmbeddedOptionsControl
-*/
-
 #include "embeddedoptionspage.h"
 #include "deviceprofiledialog.h"
 #include "widgetfactory_p.h"
diff --git a/tools/designer/src/components/formeditor/formwindow.cpp b/tools/designer/src/components/formeditor/formwindow.cpp
index 48efcde..66bab9b 100644
--- a/tools/designer/src/components/formeditor/formwindow.cpp
+++ b/tools/designer/src/components/formeditor/formwindow.cpp
@@ -39,10 +39,6 @@
 **
 ****************************************************************************/
 
-/*
-TRANSLATOR qdesigner_internal::FormWindow
-*/
-
 #include "formwindow.h"
 #include "formeditor.h"
 #include "formwindow_dnditem.h"
@@ -2140,7 +2136,10 @@ void FormWindow::layoutContainer(QWidget *w, int type)
 bool FormWindow::hasInsertedChildren(QWidget *widget) const // ### move
 {
     if (QDesignerContainerExtension *container = qt_extension<QDesignerContainerExtension*>(core()->extensionManager(), widget)) {
-        widget = container->widget(container->currentIndex());
+        const int index = container->currentIndex();
+        if (index < 0)
+            return false;
+        widget = container->widget(index);
     }
 
     const QWidgetList l = widgets(widget);
diff --git a/tools/designer/src/components/formeditor/formwindowcursor.cpp b/tools/designer/src/components/formeditor/formwindowcursor.cpp
index 5b4aee1..fb30885 100644
--- a/tools/designer/src/components/formeditor/formwindowcursor.cpp
+++ b/tools/designer/src/components/formeditor/formwindowcursor.cpp
@@ -39,10 +39,6 @@
 **
 ****************************************************************************/
 
-/*
-TRANSLATOR qdesigner_internal::FormWindowCursor
-*/
-
 #include "formwindowcursor.h"
 #include "formwindow.h"
 
diff --git a/tools/designer/src/components/formeditor/formwindowmanager.cpp b/tools/designer/src/components/formeditor/formwindowmanager.cpp
index 69fb4a3..ea8d128 100644
--- a/tools/designer/src/components/formeditor/formwindowmanager.cpp
+++ b/tools/designer/src/components/formeditor/formwindowmanager.cpp
@@ -39,10 +39,6 @@
 **
 ****************************************************************************/
 
-/*
-TRANSLATOR qdesigner_internal::FormWindowManager
-*/
-
 // components/formeditor
 #include "formwindowmanager.h"
 #include "formwindow_dnditem.h"
diff --git a/tools/designer/src/components/formeditor/qdesigner_resource.cpp b/tools/designer/src/components/formeditor/qdesigner_resource.cpp
index 064da9b..f94fb5c 100644
--- a/tools/designer/src/components/formeditor/qdesigner_resource.cpp
+++ b/tools/designer/src/components/formeditor/qdesigner_resource.cpp
@@ -753,26 +753,6 @@ void QDesignerResource::setSaveRelative(bool relative)
     m_resourceBuilder->setSaveRelative(relative);
 }
 
-static bool addFakeMethods(const DomSlots *domSlots, QStringList &fakeSlots, QStringList &fakeSignals)
-{
-    if (!domSlots)
-        return false;
-
-    bool rc = false;
-    foreach (const QString &fakeSlot, domSlots->elementSlot())
-        if (fakeSlots.indexOf(fakeSlot) == -1) {
-            fakeSlots += fakeSlot;
-            rc = true;
-        }
-
-    foreach (const QString &fakeSignal, domSlots->elementSignal())
-        if (fakeSignals.indexOf(fakeSignal) == -1) {
-            fakeSignals += fakeSignal;
-            rc = true;
-        }
-    return rc;
-}
-
 QWidget *QDesignerResource::create(DomUI *ui, QWidget *parentWidget)
 {
     // Load extra info extension. This is used by Jambi for preventing
@@ -1435,108 +1415,9 @@ DomLayoutItem *QDesignerResource::createDom(QLayoutItem *item, DomLayout *ui_lay
     return ui_item;
 }
 
-static void addFakeMethodsToWidgetDataBase(const DomCustomWidget *domCustomWidget, WidgetDataBaseItem *item)
-{
-    const DomSlots *domSlots = domCustomWidget->elementSlots();
-    if (!domSlots)
-        return;
-
-    // Merge in new slots, signals
-    QStringList fakeSlots = item->fakeSlots();
-    QStringList fakeSignals = item->fakeSignals();
-    if (addFakeMethods(domSlots, fakeSlots, fakeSignals)) {
-        item->setFakeSlots(fakeSlots);
-        item->setFakeSignals(fakeSignals);
-    }
-}
-
-void QDesignerResource::addCustomWidgetsToWidgetDatabase(DomCustomWidgetList& custom_widget_list)
-{
-    // Perform one iteration of adding the custom widgets to the database,
-    // looking up the base class and inheriting its data.
-    // Remove the succeeded custom widgets from the list.
-    // Classes whose base class could not be found are left in the list.
-    QDesignerWidgetDataBaseInterface *db = m_formWindow->core()->widgetDataBase();
-    for (int i=0; i < custom_widget_list.size(); ) {
-        bool classInserted = false;
-        DomCustomWidget *custom_widget = custom_widget_list[i];
-        const QString customClassName = custom_widget->elementClass();
-        const QString base_class = custom_widget->elementExtends();
-        QString includeFile;
-        IncludeType includeType = IncludeLocal;
-        if (const DomHeader *header = custom_widget->elementHeader()) {
-            includeFile = header->text();
-            if (header->hasAttributeLocation() && header->attributeLocation() == QLatin1String("global"))
-                includeType = IncludeGlobal;
-        }
-        const bool domIsContainer = custom_widget->elementContainer();
-        // Append a new item
-        if (base_class.isEmpty()) {
-            WidgetDataBaseItem *item = new WidgetDataBaseItem(customClassName);
-            item->setPromoted(false);
-            item->setGroup(QApplication::translate("Designer", "Custom Widgets"));
-            item->setIncludeFile(buildIncludeFile(includeFile, includeType));
-            item->setContainer(domIsContainer);
-            item->setCustom(true);
-            addFakeMethodsToWidgetDataBase(custom_widget, item);
-            db->append(item);
-            custom_widget_list.removeAt(i);
-            classInserted = true;
-        } else {
-            // Create a new entry cloned from base class. Note that this will ignore existing
-            // classes, eg, plugin custom widgets.
-            QDesignerWidgetDataBaseItemInterface *item =
-                appendDerived(db, customClassName, QApplication::translate("Designer", "Promoted Widgets"),
-                              base_class,
-                              buildIncludeFile(includeFile, includeType),
-                              true,true);
-            // Ok, base class found.
-            if (item) {
-                // Hack to accommodate for old UI-files in which "contains" is not set properly:
-                // Apply "contains" from DOM only if true (else, eg classes from QFrame might not accept
-                // dropping child widgets on them as container=false). This also allows for
-                // QWidget-derived stacked pages.
-                if (domIsContainer)
-                    item->setContainer(domIsContainer);
-
-                addFakeMethodsToWidgetDataBase(custom_widget, static_cast<WidgetDataBaseItem*>(item));
-                custom_widget_list.removeAt(i);
-                classInserted = true;
-            }
-        }
-        // Skip failed item.
-        if (!classInserted)
-            i++;
-    }
-
-}
 void QDesignerResource::createCustomWidgets(DomCustomWidgets *dom_custom_widgets)
 {
-    if (dom_custom_widgets == 0)
-        return;
-    DomCustomWidgetList custom_widget_list = dom_custom_widgets->elementCustomWidget();
-    // Attempt to insert each item derived from its base class.
-    // This should at most require two iterations in the event that the classes are out of order
-    // (derived first, max depth: promoted custom plugin = 2)
-    for (int iteration = 0;  iteration < 2;  iteration++) {
-        addCustomWidgetsToWidgetDatabase(custom_widget_list);
-        if (custom_widget_list.empty())
-            return;
-    }
-    // Oops, there are classes left whose base class could not be found.
-    // Default them to QWidget with warnings.
-    const QString fallBackBaseClass = QLatin1String("QWidget");
-    for (int i=0; i < custom_widget_list.size(); i++ ) {
-        DomCustomWidget *custom_widget = custom_widget_list[i];
-        const QString customClassName = custom_widget->elementClass();
-        const QString base_class = custom_widget->elementExtends();
-        qDebug() << "** WARNING The base class " << base_class << " of the custom widget class " << customClassName
-            << " could not be found. Defaulting to " << fallBackBaseClass << '.';
-        custom_widget->setElementExtends(fallBackBaseClass);
-    }
-    // One more pass.
-    addCustomWidgetsToWidgetDatabase(custom_widget_list);
-    Q_ASSERT(custom_widget_list.empty());
+    QSimpleResource::handleDomCustomWidgets(core(), dom_custom_widgets);
 }
 
 DomTabStops *QDesignerResource::saveTabStops()
diff --git a/tools/designer/src/components/formeditor/tool_widgeteditor.cpp b/tools/designer/src/components/formeditor/tool_widgeteditor.cpp
index 3a59543..aed7e80 100644
--- a/tools/designer/src/components/formeditor/tool_widgeteditor.cpp
+++ b/tools/designer/src/components/formeditor/tool_widgeteditor.cpp
@@ -39,10 +39,6 @@
 **
 ****************************************************************************/
 
-/*
-TRANSLATOR qdesigner_internal::WidgetEditorTool
-*/
-
 #include "tool_widgeteditor.h"
 #include "formwindow.h"
 
diff --git a/tools/designer/src/components/objectinspector/objectinspector.cpp b/tools/designer/src/components/objectinspector/objectinspector.cpp
index 4e515be..cb90d2a 100644
--- a/tools/designer/src/components/objectinspector/objectinspector.cpp
+++ b/tools/designer/src/components/objectinspector/objectinspector.cpp
@@ -39,10 +39,6 @@
 **
 ****************************************************************************/
 
-/*
-TRANSLATOR qdesigner_internal::ObjectInspector
-*/
-
 #include "objectinspector.h"
 #include "objectinspectormodel_p.h"
 #include "formwindow.h"
diff --git a/tools/designer/src/components/objectinspector/objectinspectormodel.cpp b/tools/designer/src/components/objectinspector/objectinspectormodel.cpp
index bc1ac0c..1e20ec3 100644
--- a/tools/designer/src/components/objectinspector/objectinspectormodel.cpp
+++ b/tools/designer/src/components/objectinspector/objectinspectormodel.cpp
@@ -39,10 +39,6 @@
 **
 ****************************************************************************/
 
-/*
-TRANSLATOR qdesigner_internal::ObjectInspector
-*/
-
 #include "objectinspectormodel_p.h"
 
 #include <qlayout_widget_p.h>
diff --git a/tools/designer/src/components/propertyeditor/designerpropertymanager.cpp b/tools/designer/src/components/propertyeditor/designerpropertymanager.cpp
index 346da18..1dd5bd6 100644
--- a/tools/designer/src/components/propertyeditor/designerpropertymanager.cpp
+++ b/tools/designer/src/components/propertyeditor/designerpropertymanager.cpp
@@ -2455,6 +2455,9 @@ void DesignerEditorFactory::slotStringTextChanged(const QString &value)
             if (val.userType() == DesignerPropertyManager::designerStringTypeId()) {
                 PropertySheetStringValue strVal = qVariantValue<PropertySheetStringValue>(val);
                 strVal.setValue(value);
+                // Disable translation if no translation subproperties exist.
+                if (varProp->subProperties().empty())
+                    strVal.setTranslatable(false);
                 val = qVariantFromValue(strVal);
             } else {
                 val = QVariant(value);
diff --git a/tools/designer/src/components/propertyeditor/paletteeditor.cpp b/tools/designer/src/components/propertyeditor/paletteeditor.cpp
index b0dc82b..4c60941 100644
--- a/tools/designer/src/components/propertyeditor/paletteeditor.cpp
+++ b/tools/designer/src/components/propertyeditor/paletteeditor.cpp
@@ -39,13 +39,6 @@
 **
 ****************************************************************************/
 
-/*
-TRANSLATOR qdesigner_internal::PaletteEditor
-*/
-/*
-TRANSLATOR qdesigner_internal::PaletteModel
-*/
-
 #include "paletteeditor.h"
 
 #include <iconloader_p.h>
diff --git a/tools/designer/src/components/propertyeditor/paletteeditorbutton.cpp b/tools/designer/src/components/propertyeditor/paletteeditorbutton.cpp
index d7a76b9..c425e18 100644
--- a/tools/designer/src/components/propertyeditor/paletteeditorbutton.cpp
+++ b/tools/designer/src/components/propertyeditor/paletteeditorbutton.cpp
@@ -39,10 +39,6 @@
 **
 ****************************************************************************/
 
-/*
-TRANSLATOR qdesigner_internal::PaletteEditorButton
-*/
-
 #include "paletteeditorbutton.h"
 #include "paletteeditor.h"
 
diff --git a/tools/designer/src/components/propertyeditor/previewframe.cpp b/tools/designer/src/components/propertyeditor/previewframe.cpp
index 95d533d..e94ace0 100644
--- a/tools/designer/src/components/propertyeditor/previewframe.cpp
+++ b/tools/designer/src/components/propertyeditor/previewframe.cpp
@@ -39,10 +39,6 @@
 **
 ****************************************************************************/
 
-/*
-TRANSLATOR qdesigner_internal::PreviewWorkspace
-*/
-
 #include "previewframe.h"
 #include "previewwidget.h"
 
diff --git a/tools/designer/src/components/propertyeditor/propertyeditor.cpp b/tools/designer/src/components/propertyeditor/propertyeditor.cpp
index 806e1dd..eab7a12 100644
--- a/tools/designer/src/components/propertyeditor/propertyeditor.cpp
+++ b/tools/designer/src/components/propertyeditor/propertyeditor.cpp
@@ -137,13 +137,8 @@ void PropertyEditor::setupStringProperty(QtVariantProperty *property, bool isMai
     const bool hasComment = params.second;
     property->setAttribute(m_strings.m_validationModeAttribute, params.first);
     // assuming comment cannot appear or disappear for the same property in different object instance
-    if (!hasComment) {
-        QList<QtProperty *> commentProperties = property->subProperties();
-        if (commentProperties.count() > 0)
-            delete commentProperties.at(0);
-        if (commentProperties.count() > 1)
-            delete commentProperties.at(1);
-    }
+    if (!hasComment)
+        qDeleteAll(property->subProperties());
 }
 
 void PropertyEditor::setupPaletteProperty(QtVariantProperty *property)
diff --git a/tools/designer/src/components/propertyeditor/stringlisteditorbutton.cpp b/tools/designer/src/components/propertyeditor/stringlisteditorbutton.cpp
index 440015c..32a8c78 100644
--- a/tools/designer/src/components/propertyeditor/stringlisteditorbutton.cpp
+++ b/tools/designer/src/components/propertyeditor/stringlisteditorbutton.cpp
@@ -39,10 +39,6 @@
 **
 ****************************************************************************/
 
-/*
-TRANSLATOR qdesigner_internal::StringListEditorButton
-*/
-
 #include "stringlisteditorbutton.h"
 #include "stringlisteditor.h"
 
diff --git a/tools/designer/src/components/signalsloteditor/signalsloteditor_plugin.cpp b/tools/designer/src/components/signalsloteditor/signalsloteditor_plugin.cpp
index 311c843..a6f4969 100644
--- a/tools/designer/src/components/signalsloteditor/signalsloteditor_plugin.cpp
+++ b/tools/designer/src/components/signalsloteditor/signalsloteditor_plugin.cpp
@@ -39,10 +39,6 @@
 **
 ****************************************************************************/
 
-/*
-TRANSLATOR qdesigner_internal::SignalSlotEditorPlugin
-*/
-
 #include "signalsloteditor_plugin.h"
 #include "signalsloteditor_tool.h"
 
diff --git a/tools/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp b/tools/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp
index 973105c..311ec36 100644
--- a/tools/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp
+++ b/tools/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp
@@ -39,10 +39,6 @@
 **
 ****************************************************************************/
 
-/*
-TRANSLATOR qdesigner_internal::SignalSlotEditorTool
-*/
-
 #include "signalsloteditor_tool.h"
 #include "signalsloteditor.h"
 #include "ui4_p.h"
diff --git a/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp b/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
index dc6b3c3..c916af8 100644
--- a/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
+++ b/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
@@ -39,10 +39,6 @@
 **
 ****************************************************************************/
 
-/*
-TRANSLATOR qdesigner_internal::ConnectionModel
-*/
-
 #include "signalsloteditorwindow.h"
 #include "signalsloteditor_p.h"
 #include "signalsloteditor.h"
diff --git a/tools/designer/src/components/tabordereditor/tabordereditor_plugin.cpp b/tools/designer/src/components/tabordereditor/tabordereditor_plugin.cpp
index 46bf378..abe882b 100644
--- a/tools/designer/src/components/tabordereditor/tabordereditor_plugin.cpp
+++ b/tools/designer/src/components/tabordereditor/tabordereditor_plugin.cpp
@@ -39,10 +39,6 @@
 **
 ****************************************************************************/
 
-/*
-TRANSLATOR qdesigner_internal::TabOrderEditorPlugin
-*/
-
 #include <QtGui/QAction>
 
 #include "tabordereditor_plugin.h"
diff --git a/tools/designer/src/components/tabordereditor/tabordereditor_tool.cpp b/tools/designer/src/components/tabordereditor/tabordereditor_tool.cpp
index 4f291a1..75304ee 100644
--- a/tools/designer/src/components/tabordereditor/tabordereditor_tool.cpp
+++ b/tools/designer/src/components/tabordereditor/tabordereditor_tool.cpp
@@ -39,10 +39,6 @@
 **
 ****************************************************************************/
 
-/*
-TRANSLATOR qdesigner_internal::TabOrderEditorTool
-*/
-
 #include "tabordereditor_tool.h"
 #include "tabordereditor.h"
 
diff --git a/tools/designer/src/components/taskmenu/button_taskmenu.cpp b/tools/designer/src/components/taskmenu/button_taskmenu.cpp
index ced32ce..c2816a2 100644
--- a/tools/designer/src/components/taskmenu/button_taskmenu.cpp
+++ b/tools/designer/src/components/taskmenu/button_taskmenu.cpp
@@ -39,10 +39,6 @@
 **
 ****************************************************************************/
 
-/*
-TRANSLATOR qdesigner_internal::ButtonTaskMenu
-*/
-
 #include "button_taskmenu.h"
 #include "inplace_editor.h"
 #include <qdesigner_formwindowcommand_p.h>
diff --git a/tools/designer/src/components/taskmenu/combobox_taskmenu.cpp b/tools/designer/src/components/taskmenu/combobox_taskmenu.cpp
index e3364cc..908cb61 100644
--- a/tools/designer/src/components/taskmenu/combobox_taskmenu.cpp
+++ b/tools/designer/src/components/taskmenu/combobox_taskmenu.cpp
@@ -39,10 +39,6 @@
 **
 ****************************************************************************/
 
-/*
-TRANSLATOR qdesigner_internal::ComboBoxTaskMenu
-*/
-
 #include "combobox_taskmenu.h"
 #include "listwidgeteditor.h"
 #include "qdesigner_utils_p.h"
diff --git a/tools/designer/src/components/taskmenu/containerwidget_taskmenu.cpp b/tools/designer/src/components/taskmenu/containerwidget_taskmenu.cpp
index b182ddf..c6673e3 100644
--- a/tools/designer/src/components/taskmenu/containerwidget_taskmenu.cpp
+++ b/tools/designer/src/components/taskmenu/containerwidget_taskmenu.cpp
@@ -39,13 +39,8 @@
 **
 ****************************************************************************/
 
-/*
-TRANSLATOR qdesigner_internal::ContainerWidgetTaskMenu
-*/
-
 #include "containerwidget_taskmenu.h"
 
-
 #include <QtDesigner/QDesignerFormEditorInterface>
 #include <QtDesigner/QDesignerFormWindowInterface>
 #include <QtDesigner/QExtensionManager>
diff --git a/tools/designer/src/components/taskmenu/groupbox_taskmenu.cpp b/tools/designer/src/components/taskmenu/groupbox_taskmenu.cpp
index bb97342..18b6612 100644
--- a/tools/designer/src/components/taskmenu/groupbox_taskmenu.cpp
+++ b/tools/designer/src/components/taskmenu/groupbox_taskmenu.cpp
@@ -39,10 +39,6 @@
 **
 ****************************************************************************/
 
-/*
-TRANSLATOR qdesigner_internal::GroupBoxTaskMenu
-*/
-
 #include "groupbox_taskmenu.h"
 #include "inplace_editor.h"
 
diff --git a/tools/designer/src/components/taskmenu/label_taskmenu.cpp b/tools/designer/src/components/taskmenu/label_taskmenu.cpp
index 77e5ed9..f85df33 100644
--- a/tools/designer/src/components/taskmenu/label_taskmenu.cpp
+++ b/tools/designer/src/components/taskmenu/label_taskmenu.cpp
@@ -39,10 +39,6 @@
 **
 ****************************************************************************/
 
-/*
-TRANSLATOR qdesigner_internal::LabelTaskMenu
-*/
-
 #include "label_taskmenu.h"
 #include "inplace_editor.h"
 
diff --git a/tools/designer/src/components/taskmenu/layouttaskmenu.cpp b/tools/designer/src/components/taskmenu/layouttaskmenu.cpp
index 4a3aeec..0bfe607 100644
--- a/tools/designer/src/components/taskmenu/layouttaskmenu.cpp
+++ b/tools/designer/src/components/taskmenu/layouttaskmenu.cpp
@@ -39,10 +39,6 @@
 **
 ****************************************************************************/
 
-/*
-TRANSLATOR qdesigner_internal::LayoutWidgetTaskMenu
-*/
-
 #include "layouttaskmenu.h"
 #include <formlayoutmenu_p.h>
 #include <morphmenu_p.h>
diff --git a/tools/designer/src/components/taskmenu/lineedit_taskmenu.cpp b/tools/designer/src/components/taskmenu/lineedit_taskmenu.cpp
index baf4785..a88246a 100644
--- a/tools/designer/src/components/taskmenu/lineedit_taskmenu.cpp
+++ b/tools/designer/src/components/taskmenu/lineedit_taskmenu.cpp
@@ -39,10 +39,6 @@
 **
 ****************************************************************************/
 
-/*
-TRANSLATOR qdesigner_internal::LineEditTaskMenu
-*/
-
 #include "lineedit_taskmenu.h"
 #include "inplace_editor.h"
 
diff --git a/tools/designer/src/components/taskmenu/listwidget_taskmenu.cpp b/tools/designer/src/components/taskmenu/listwidget_taskmenu.cpp
index 1a9ba36..10e004d 100644
--- a/tools/designer/src/components/taskmenu/listwidget_taskmenu.cpp
+++ b/tools/designer/src/components/taskmenu/listwidget_taskmenu.cpp
@@ -39,10 +39,6 @@
 **
 ****************************************************************************/
 
-/*
-TRANSLATOR qdesigner_internal::ListWidgetTaskMenu
-*/
-
 #include "listwidget_taskmenu.h"
 #include "listwidgeteditor.h"
 #include "qdesigner_utils_p.h"
diff --git a/tools/designer/src/components/taskmenu/listwidgeteditor.cpp b/tools/designer/src/components/taskmenu/listwidgeteditor.cpp
index 2a8de52..4c3ede9 100644
--- a/tools/designer/src/components/taskmenu/listwidgeteditor.cpp
+++ b/tools/designer/src/components/taskmenu/listwidgeteditor.cpp
@@ -39,10 +39,6 @@
 **
 ****************************************************************************/
 
-/*
-TRANSLATOR qdesigner_internal::ListWidgetEditor
-*/
-
 #include "listwidgeteditor.h"
 #include <designerpropertymanager.h>
 #include <abstractformbuilder.h>
diff --git a/tools/designer/src/components/taskmenu/menutaskmenu.cpp b/tools/designer/src/components/taskmenu/menutaskmenu.cpp
index 52320ac..093a1fe 100644
--- a/tools/designer/src/components/taskmenu/menutaskmenu.cpp
+++ b/tools/designer/src/components/taskmenu/menutaskmenu.cpp
@@ -39,10 +39,6 @@
 **
 ****************************************************************************/
 
-/*
-TRANSLATOR qdesigner_internal::MenuTaskMenu
-*/
-
 #include "menutaskmenu.h"
 
 #include <promotiontaskmenu_p.h>
diff --git a/tools/designer/src/components/taskmenu/tablewidget_taskmenu.cpp b/tools/designer/src/components/taskmenu/tablewidget_taskmenu.cpp
index 5ef1f9c..dce9f97 100644
--- a/tools/designer/src/components/taskmenu/tablewidget_taskmenu.cpp
+++ b/tools/designer/src/components/taskmenu/tablewidget_taskmenu.cpp
@@ -39,10 +39,6 @@
 **
 ****************************************************************************/
 
-/*
-TRANSLATOR qdesigner_internal::TableWidgetTaskMenu
-*/
-
 #include "tablewidget_taskmenu.h"
 #include "tablewidgeteditor.h"
 
diff --git a/tools/designer/src/components/taskmenu/tablewidgeteditor.cpp b/tools/designer/src/components/taskmenu/tablewidgeteditor.cpp
index 0863847..be1f89a 100644
--- a/tools/designer/src/components/taskmenu/tablewidgeteditor.cpp
+++ b/tools/designer/src/components/taskmenu/tablewidgeteditor.cpp
@@ -39,10 +39,6 @@
 **
 ****************************************************************************/
 
-/*
-TRANSLATOR qdesigner_internal::TableWidgetEditor
-*/
-
 #include "tablewidgeteditor.h"
 #include <abstractformbuilder.h>
 #include <iconloader_p.h>
diff --git a/tools/designer/src/components/taskmenu/textedit_taskmenu.cpp b/tools/designer/src/components/taskmenu/textedit_taskmenu.cpp
index feaec2c..a9a2a96 100644
--- a/tools/designer/src/components/taskmenu/textedit_taskmenu.cpp
+++ b/tools/designer/src/components/taskmenu/textedit_taskmenu.cpp
@@ -39,10 +39,6 @@
 **
 ****************************************************************************/
 
-/*
-TRANSLATOR qdesigner_internal::TextEditTaskMenu
-*/
-
 #include "textedit_taskmenu.h"
 
 #include <QtDesigner/QDesignerFormWindowInterface>
diff --git a/tools/designer/src/components/taskmenu/toolbar_taskmenu.cpp b/tools/designer/src/components/taskmenu/toolbar_taskmenu.cpp
index a15cd8a..d841b87 100644
--- a/tools/designer/src/components/taskmenu/toolbar_taskmenu.cpp
+++ b/tools/designer/src/components/taskmenu/toolbar_taskmenu.cpp
@@ -39,10 +39,6 @@
 **
 ****************************************************************************/
 
-/*
-TRANSLATOR qdesigner_internal::ToolBarTaskMenu
-*/
-
 #include "toolbar_taskmenu.h"
 #include "qdesigner_toolbar_p.h"
 
diff --git a/tools/designer/src/components/taskmenu/treewidget_taskmenu.cpp b/tools/designer/src/components/taskmenu/treewidget_taskmenu.cpp
index b1c8c28..34d883a 100644
--- a/tools/designer/src/components/taskmenu/treewidget_taskmenu.cpp
+++ b/tools/designer/src/components/taskmenu/treewidget_taskmenu.cpp
@@ -39,10 +39,6 @@
 **
 ****************************************************************************/
 
-/*
-TRANSLATOR qdesigner_internal::TreeWidgetTaskMenu
-*/
-
 #include "treewidget_taskmenu.h"
 #include "treewidgeteditor.h"
 
diff --git a/tools/designer/src/components/taskmenu/treewidgeteditor.cpp b/tools/designer/src/components/taskmenu/treewidgeteditor.cpp
index faf00f2..e97ebde 100644
--- a/tools/designer/src/components/taskmenu/treewidgeteditor.cpp
+++ b/tools/designer/src/components/taskmenu/treewidgeteditor.cpp
@@ -39,10 +39,6 @@
 **
 ****************************************************************************/
 
-/*
-TRANSLATOR qdesigner_internal::TreeWidgetEditor
-*/
-
 #include "treewidgeteditor.h"
 #include <formwindowbase_p.h>
 #include <iconloader_p.h>