Qt Designer: Remove QScript extension.

Change-Id: I351b1437442b65a96e07de6fa633e06f3953c128
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

1 files changed, 1 insertions, 34 deletions

diff --git a/src/designer/src/components/formeditor/qdesigner_resource.cpp b/src/designer/src/components/formeditor/qdesigner_resource.cpp
index 621283187..84708141e 100644
--- a/src/designer/src/components/formeditor/qdesigner_resource.cpp
+++ b/src/designer/src/components/formeditor/qdesigner_resource.cpp
@@ -805,20 +805,7 @@ QWidget *QDesignerResource::create(DomWidget *ui_widget, QWidget *parentWidget)
     }
 
     ui_widget->setAttributeClass(className); // fix the class name
-    applyExtensionDataFromDOM(this, core(), ui_widget, w, true);
-
-    // store user-defined scripts
-    if (MetaDataBase *metaDataBase = qobject_cast<MetaDataBase *>(core()->metaDataBase())) {
-        const QString designerSource = QStringLiteral("designer");
-        const DomScripts domScripts = ui_widget->elementScript();
-        if (!domScripts.empty()) {
-            foreach (const DomScript *script, domScripts) {
-                if (script->hasAttributeSource() && script->attributeSource() == designerSource) {
-                    metaDataBase->metaDataBaseItem(w)->setScript(script->text());
-                }
-            }
-        }
-    }
+    applyExtensionDataFromDOM(this, core(), ui_widget, w);
 
     return w;
 }
@@ -1150,8 +1137,6 @@ DomWidget *QDesignerResource::createDom(QWidget *widget, DomWidget *ui_parentWid
             w->setAttributeClass(widgetInfo->name());
     }
     addExtensionDataToDOM(this, core(), w, widget);
-
-    addUserDefinedScripts(widget, w);
     return w;
 }
 
@@ -1885,10 +1870,6 @@ DomCustomWidgets *QDesignerResource::saveCustomWidgets()
                 custom_widget->setElementAddPageMethod(addPageMethod);
         }
 
-        // Look up static per-class scripts of designer
-        if (DomScript *domScript = createScript(customWidgetScript(core, name), ScriptCustomWidgetPlugin))
-            custom_widget->setElementScript(domScript);
-
         orderedMap.insert(db->indexOfClassName(name), custom_widget);
     }
 
@@ -2286,20 +2267,6 @@ void QDesignerResource::loadExtraInfo(DomWidget *ui_widget, QWidget *widget, QWi
         applyAttributesToPropertySheet(ui_widget, widget);
 }
 
-// Add user defined scripts (dialog box) belonging to QWidget to DomWidget.
-void QDesignerResource::addUserDefinedScripts(QWidget *w, DomWidget *ui_widget)
-{
-    QDesignerFormEditorInterface *core = m_formWindow->core();
-    DomScripts domScripts = ui_widget->elementScript();
-    // Look up user-defined scripts of designer
-    if (const qdesigner_internal::MetaDataBase *metaDataBase = qobject_cast<const qdesigner_internal::MetaDataBase *>(core->metaDataBase())) {
-        if (const qdesigner_internal::MetaDataBaseItem *metaItem = metaDataBase->metaDataBaseItem(w)) {
-            addScript(metaItem->script(), ScriptDesigner, domScripts);
-        }
-    }
-    if (!domScripts.empty())
-        ui_widget->setElementScript(domScripts);
-}
 }
 
 QT_END_NAMESPACE