diff --git a/src/plugins/coreplugin/images/category_help.png b/src/plugins/coreplugin/images/category_help.png index ce2497f9ad6..5cc973c5311 100644 Binary files a/src/plugins/coreplugin/images/category_help.png and b/src/plugins/coreplugin/images/category_help.png differ diff --git a/src/plugins/coreplugin/images/mode_Project.png b/src/plugins/coreplugin/images/mode_Project.png index a62200a97c1..d1183a64029 100644 Binary files a/src/plugins/coreplugin/images/mode_Project.png and b/src/plugins/coreplugin/images/mode_Project.png differ diff --git a/src/plugins/coreplugin/images/mode_Reference.png b/src/plugins/coreplugin/images/mode_Reference.png index 1e51235a933..0bc7bf23b37 100644 Binary files a/src/plugins/coreplugin/images/mode_Reference.png and b/src/plugins/coreplugin/images/mode_Reference.png differ diff --git a/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp b/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp index 7ab5a8259c4..d56c1bce82f 100644 --- a/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp +++ b/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp @@ -262,6 +262,12 @@ QList DesignDocumentController::loadMaster(QPlainTextEdit * //m_d->masterModel = Model::create(m_d->textModifier, m_d->searchPath, errors); m_d->masterModel = Model::create("Qt/Rectangle", 4, 7); + +#if defined(VIEWLOGGER) + m_d->viewLogger = new Internal::ViewLogger(m_d->model.data()); + m_d->masterModel->attachView(m_d->viewLogger.data()); +#endif + m_d->masterModel->setFileUrl(m_d->searchPath); m_d->subComponentModel = Model::create("Qt/Rectangle", 4, 7); @@ -278,10 +284,7 @@ QList DesignDocumentController::loadMaster(QPlainTextEdit * m_d->masterModel->attachView(m_d->rewriterView.data()); m_d->model = m_d->masterModel; -#if defined(VIEWLOGGER) - m_d->viewLogger = new Internal::ViewLogger(m_d->model.data()); - m_d->masterModel->attachView(m_d->viewLogger.data()); -#endif + loadCurrentModel(); diff --git a/src/plugins/qmldesigner/core/depend_paths.pri b/src/plugins/qmldesigner/designercore/depend_paths.pri similarity index 100% rename from src/plugins/qmldesigner/core/depend_paths.pri rename to src/plugins/qmldesigner/designercore/depend_paths.pri diff --git a/src/plugins/qmldesigner/core/core.pri b/src/plugins/qmldesigner/designercore/designercore.pri similarity index 99% rename from src/plugins/qmldesigner/core/core.pri rename to src/plugins/qmldesigner/designercore/designercore.pri index ee258573e9a..81674e0eb05 100644 --- a/src/plugins/qmldesigner/core/core.pri +++ b/src/plugins/qmldesigner/designercore/designercore.pri @@ -196,5 +196,5 @@ contains(CONFIG, plugin) { } DISTFILES += $$PWD/metafile/widget.metafile -RESOURCES += $$PWD/core.qrc +RESOURCES += $$PWD/designercore.qrc OTHER_FILES += $$PWD/metainfo/gui.metainfo diff --git a/src/plugins/qmldesigner/core/core.qrc b/src/plugins/qmldesigner/designercore/designercore.qrc similarity index 100% rename from src/plugins/qmldesigner/core/core.qrc rename to src/plugins/qmldesigner/designercore/designercore.qrc diff --git a/src/plugins/qmldesigner/core/exceptions/exception.cpp b/src/plugins/qmldesigner/designercore/exceptions/exception.cpp similarity index 100% rename from src/plugins/qmldesigner/core/exceptions/exception.cpp rename to src/plugins/qmldesigner/designercore/exceptions/exception.cpp diff --git a/src/plugins/qmldesigner/core/exceptions/invalidargumentexception.cpp b/src/plugins/qmldesigner/designercore/exceptions/invalidargumentexception.cpp similarity index 100% rename from src/plugins/qmldesigner/core/exceptions/invalidargumentexception.cpp rename to src/plugins/qmldesigner/designercore/exceptions/invalidargumentexception.cpp diff --git a/src/plugins/qmldesigner/core/exceptions/invalididexception.cpp b/src/plugins/qmldesigner/designercore/exceptions/invalididexception.cpp similarity index 100% rename from src/plugins/qmldesigner/core/exceptions/invalididexception.cpp rename to src/plugins/qmldesigner/designercore/exceptions/invalididexception.cpp diff --git a/src/plugins/qmldesigner/core/exceptions/invalidmetainfoexception.cpp b/src/plugins/qmldesigner/designercore/exceptions/invalidmetainfoexception.cpp similarity index 100% rename from src/plugins/qmldesigner/core/exceptions/invalidmetainfoexception.cpp rename to src/plugins/qmldesigner/designercore/exceptions/invalidmetainfoexception.cpp diff --git a/src/plugins/qmldesigner/core/exceptions/invalidmodelnodeexception.cpp b/src/plugins/qmldesigner/designercore/exceptions/invalidmodelnodeexception.cpp similarity index 100% rename from src/plugins/qmldesigner/core/exceptions/invalidmodelnodeexception.cpp rename to src/plugins/qmldesigner/designercore/exceptions/invalidmodelnodeexception.cpp diff --git a/src/plugins/qmldesigner/core/exceptions/invalidmodelstateexception.cpp b/src/plugins/qmldesigner/designercore/exceptions/invalidmodelstateexception.cpp similarity index 100% rename from src/plugins/qmldesigner/core/exceptions/invalidmodelstateexception.cpp rename to src/plugins/qmldesigner/designercore/exceptions/invalidmodelstateexception.cpp diff --git a/src/plugins/qmldesigner/core/exceptions/invalidnodeinstanceexception.cpp b/src/plugins/qmldesigner/designercore/exceptions/invalidnodeinstanceexception.cpp similarity index 100% rename from src/plugins/qmldesigner/core/exceptions/invalidnodeinstanceexception.cpp rename to src/plugins/qmldesigner/designercore/exceptions/invalidnodeinstanceexception.cpp diff --git a/src/plugins/qmldesigner/core/exceptions/invalidnodestateexception.cpp b/src/plugins/qmldesigner/designercore/exceptions/invalidnodestateexception.cpp similarity index 100% rename from src/plugins/qmldesigner/core/exceptions/invalidnodestateexception.cpp rename to src/plugins/qmldesigner/designercore/exceptions/invalidnodestateexception.cpp diff --git a/src/plugins/qmldesigner/core/exceptions/invalidpropertyexception.cpp b/src/plugins/qmldesigner/designercore/exceptions/invalidpropertyexception.cpp similarity index 100% rename from src/plugins/qmldesigner/core/exceptions/invalidpropertyexception.cpp rename to src/plugins/qmldesigner/designercore/exceptions/invalidpropertyexception.cpp diff --git a/src/plugins/qmldesigner/core/exceptions/invalidqmlsourceexception.cpp b/src/plugins/qmldesigner/designercore/exceptions/invalidqmlsourceexception.cpp similarity index 100% rename from src/plugins/qmldesigner/core/exceptions/invalidqmlsourceexception.cpp rename to src/plugins/qmldesigner/designercore/exceptions/invalidqmlsourceexception.cpp diff --git a/src/plugins/qmldesigner/core/exceptions/invalidreparentingexception.cpp b/src/plugins/qmldesigner/designercore/exceptions/invalidreparentingexception.cpp similarity index 100% rename from src/plugins/qmldesigner/core/exceptions/invalidreparentingexception.cpp rename to src/plugins/qmldesigner/designercore/exceptions/invalidreparentingexception.cpp diff --git a/src/plugins/qmldesigner/core/exceptions/invalidslideindexexception.cpp b/src/plugins/qmldesigner/designercore/exceptions/invalidslideindexexception.cpp similarity index 100% rename from src/plugins/qmldesigner/core/exceptions/invalidslideindexexception.cpp rename to src/plugins/qmldesigner/designercore/exceptions/invalidslideindexexception.cpp diff --git a/src/plugins/qmldesigner/core/exceptions/modificationgroupexception.cpp b/src/plugins/qmldesigner/designercore/exceptions/modificationgroupexception.cpp similarity index 100% rename from src/plugins/qmldesigner/core/exceptions/modificationgroupexception.cpp rename to src/plugins/qmldesigner/designercore/exceptions/modificationgroupexception.cpp diff --git a/src/plugins/qmldesigner/core/exceptions/noanchoringpossibleexception.cpp b/src/plugins/qmldesigner/designercore/exceptions/noanchoringpossibleexception.cpp similarity index 100% rename from src/plugins/qmldesigner/core/exceptions/noanchoringpossibleexception.cpp rename to src/plugins/qmldesigner/designercore/exceptions/noanchoringpossibleexception.cpp diff --git a/src/plugins/qmldesigner/core/exceptions/notimplementedexception.cpp b/src/plugins/qmldesigner/designercore/exceptions/notimplementedexception.cpp similarity index 100% rename from src/plugins/qmldesigner/core/exceptions/notimplementedexception.cpp rename to src/plugins/qmldesigner/designercore/exceptions/notimplementedexception.cpp diff --git a/src/plugins/qmldesigner/core/exceptions/removebasestateexception.cpp b/src/plugins/qmldesigner/designercore/exceptions/removebasestateexception.cpp similarity index 100% rename from src/plugins/qmldesigner/core/exceptions/removebasestateexception.cpp rename to src/plugins/qmldesigner/designercore/exceptions/removebasestateexception.cpp diff --git a/src/plugins/qmldesigner/core/exceptions/rewritingexception.cpp b/src/plugins/qmldesigner/designercore/exceptions/rewritingexception.cpp similarity index 100% rename from src/plugins/qmldesigner/core/exceptions/rewritingexception.cpp rename to src/plugins/qmldesigner/designercore/exceptions/rewritingexception.cpp diff --git a/src/plugins/qmldesigner/core/filemanager/addarraymembervisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/addarraymembervisitor.cpp similarity index 100% rename from src/plugins/qmldesigner/core/filemanager/addarraymembervisitor.cpp rename to src/plugins/qmldesigner/designercore/filemanager/addarraymembervisitor.cpp diff --git a/src/plugins/qmldesigner/core/filemanager/addarraymembervisitor.h b/src/plugins/qmldesigner/designercore/filemanager/addarraymembervisitor.h similarity index 100% rename from src/plugins/qmldesigner/core/filemanager/addarraymembervisitor.h rename to src/plugins/qmldesigner/designercore/filemanager/addarraymembervisitor.h diff --git a/src/plugins/qmldesigner/core/filemanager/addobjectvisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/addobjectvisitor.cpp similarity index 100% rename from src/plugins/qmldesigner/core/filemanager/addobjectvisitor.cpp rename to src/plugins/qmldesigner/designercore/filemanager/addobjectvisitor.cpp diff --git a/src/plugins/qmldesigner/core/filemanager/addobjectvisitor.h b/src/plugins/qmldesigner/designercore/filemanager/addobjectvisitor.h similarity index 100% rename from src/plugins/qmldesigner/core/filemanager/addobjectvisitor.h rename to src/plugins/qmldesigner/designercore/filemanager/addobjectvisitor.h diff --git a/src/plugins/qmldesigner/core/filemanager/addpropertyvisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/addpropertyvisitor.cpp similarity index 100% rename from src/plugins/qmldesigner/core/filemanager/addpropertyvisitor.cpp rename to src/plugins/qmldesigner/designercore/filemanager/addpropertyvisitor.cpp diff --git a/src/plugins/qmldesigner/core/filemanager/addpropertyvisitor.h b/src/plugins/qmldesigner/designercore/filemanager/addpropertyvisitor.h similarity index 100% rename from src/plugins/qmldesigner/core/filemanager/addpropertyvisitor.h rename to src/plugins/qmldesigner/designercore/filemanager/addpropertyvisitor.h diff --git a/src/plugins/qmldesigner/core/filemanager/astobjecttextextractor.cpp b/src/plugins/qmldesigner/designercore/filemanager/astobjecttextextractor.cpp similarity index 100% rename from src/plugins/qmldesigner/core/filemanager/astobjecttextextractor.cpp rename to src/plugins/qmldesigner/designercore/filemanager/astobjecttextextractor.cpp diff --git a/src/plugins/qmldesigner/core/filemanager/astobjecttextextractor.h b/src/plugins/qmldesigner/designercore/filemanager/astobjecttextextractor.h similarity index 100% rename from src/plugins/qmldesigner/core/filemanager/astobjecttextextractor.h rename to src/plugins/qmldesigner/designercore/filemanager/astobjecttextextractor.h diff --git a/src/plugins/qmldesigner/core/filemanager/changeimportsvisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.cpp similarity index 100% rename from src/plugins/qmldesigner/core/filemanager/changeimportsvisitor.cpp rename to src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.cpp diff --git a/src/plugins/qmldesigner/core/filemanager/changeimportsvisitor.h b/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.h similarity index 100% rename from src/plugins/qmldesigner/core/filemanager/changeimportsvisitor.h rename to src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.h diff --git a/src/plugins/qmldesigner/core/filemanager/changeobjecttypevisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/changeobjecttypevisitor.cpp similarity index 100% rename from src/plugins/qmldesigner/core/filemanager/changeobjecttypevisitor.cpp rename to src/plugins/qmldesigner/designercore/filemanager/changeobjecttypevisitor.cpp diff --git a/src/plugins/qmldesigner/core/filemanager/changeobjecttypevisitor.h b/src/plugins/qmldesigner/designercore/filemanager/changeobjecttypevisitor.h similarity index 100% rename from src/plugins/qmldesigner/core/filemanager/changeobjecttypevisitor.h rename to src/plugins/qmldesigner/designercore/filemanager/changeobjecttypevisitor.h diff --git a/src/plugins/qmldesigner/core/filemanager/changepropertyvisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/changepropertyvisitor.cpp similarity index 100% rename from src/plugins/qmldesigner/core/filemanager/changepropertyvisitor.cpp rename to src/plugins/qmldesigner/designercore/filemanager/changepropertyvisitor.cpp diff --git a/src/plugins/qmldesigner/core/filemanager/changepropertyvisitor.h b/src/plugins/qmldesigner/designercore/filemanager/changepropertyvisitor.h similarity index 100% rename from src/plugins/qmldesigner/core/filemanager/changepropertyvisitor.h rename to src/plugins/qmldesigner/designercore/filemanager/changepropertyvisitor.h diff --git a/src/plugins/qmldesigner/core/filemanager/filemanager.pri b/src/plugins/qmldesigner/designercore/filemanager/filemanager.pri similarity index 100% rename from src/plugins/qmldesigner/core/filemanager/filemanager.pri rename to src/plugins/qmldesigner/designercore/filemanager/filemanager.pri diff --git a/src/plugins/qmldesigner/core/filemanager/firstdefinitionfinder.cpp b/src/plugins/qmldesigner/designercore/filemanager/firstdefinitionfinder.cpp similarity index 100% rename from src/plugins/qmldesigner/core/filemanager/firstdefinitionfinder.cpp rename to src/plugins/qmldesigner/designercore/filemanager/firstdefinitionfinder.cpp diff --git a/src/plugins/qmldesigner/core/filemanager/firstdefinitionfinder.h b/src/plugins/qmldesigner/designercore/filemanager/firstdefinitionfinder.h similarity index 100% rename from src/plugins/qmldesigner/core/filemanager/firstdefinitionfinder.h rename to src/plugins/qmldesigner/designercore/filemanager/firstdefinitionfinder.h diff --git a/src/plugins/qmldesigner/core/filemanager/moveobjectbeforeobjectvisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.cpp similarity index 100% rename from src/plugins/qmldesigner/core/filemanager/moveobjectbeforeobjectvisitor.cpp rename to src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.cpp diff --git a/src/plugins/qmldesigner/core/filemanager/moveobjectbeforeobjectvisitor.h b/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.h similarity index 100% rename from src/plugins/qmldesigner/core/filemanager/moveobjectbeforeobjectvisitor.h rename to src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.h diff --git a/src/plugins/qmldesigner/core/filemanager/moveobjectvisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/moveobjectvisitor.cpp similarity index 100% rename from src/plugins/qmldesigner/core/filemanager/moveobjectvisitor.cpp rename to src/plugins/qmldesigner/designercore/filemanager/moveobjectvisitor.cpp diff --git a/src/plugins/qmldesigner/core/filemanager/moveobjectvisitor.h b/src/plugins/qmldesigner/designercore/filemanager/moveobjectvisitor.h similarity index 100% rename from src/plugins/qmldesigner/core/filemanager/moveobjectvisitor.h rename to src/plugins/qmldesigner/designercore/filemanager/moveobjectvisitor.h diff --git a/src/plugins/qmldesigner/core/filemanager/objectlengthcalculator.cpp b/src/plugins/qmldesigner/designercore/filemanager/objectlengthcalculator.cpp similarity index 100% rename from src/plugins/qmldesigner/core/filemanager/objectlengthcalculator.cpp rename to src/plugins/qmldesigner/designercore/filemanager/objectlengthcalculator.cpp diff --git a/src/plugins/qmldesigner/core/filemanager/objectlengthcalculator.h b/src/plugins/qmldesigner/designercore/filemanager/objectlengthcalculator.h similarity index 100% rename from src/plugins/qmldesigner/core/filemanager/objectlengthcalculator.h rename to src/plugins/qmldesigner/designercore/filemanager/objectlengthcalculator.h diff --git a/src/plugins/qmldesigner/core/filemanager/qmlrefactoring.cpp b/src/plugins/qmldesigner/designercore/filemanager/qmlrefactoring.cpp similarity index 100% rename from src/plugins/qmldesigner/core/filemanager/qmlrefactoring.cpp rename to src/plugins/qmldesigner/designercore/filemanager/qmlrefactoring.cpp diff --git a/src/plugins/qmldesigner/core/filemanager/qmlrefactoring.h b/src/plugins/qmldesigner/designercore/filemanager/qmlrefactoring.h similarity index 100% rename from src/plugins/qmldesigner/core/filemanager/qmlrefactoring.h rename to src/plugins/qmldesigner/designercore/filemanager/qmlrefactoring.h diff --git a/src/plugins/qmldesigner/core/filemanager/qmlrewriter.cpp b/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.cpp similarity index 100% rename from src/plugins/qmldesigner/core/filemanager/qmlrewriter.cpp rename to src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.cpp diff --git a/src/plugins/qmldesigner/core/filemanager/qmlrewriter.h b/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.h similarity index 100% rename from src/plugins/qmldesigner/core/filemanager/qmlrewriter.h rename to src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.h diff --git a/src/plugins/qmldesigner/core/filemanager/removepropertyvisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/removepropertyvisitor.cpp similarity index 100% rename from src/plugins/qmldesigner/core/filemanager/removepropertyvisitor.cpp rename to src/plugins/qmldesigner/designercore/filemanager/removepropertyvisitor.cpp diff --git a/src/plugins/qmldesigner/core/filemanager/removepropertyvisitor.h b/src/plugins/qmldesigner/designercore/filemanager/removepropertyvisitor.h similarity index 100% rename from src/plugins/qmldesigner/core/filemanager/removepropertyvisitor.h rename to src/plugins/qmldesigner/designercore/filemanager/removepropertyvisitor.h diff --git a/src/plugins/qmldesigner/core/filemanager/removeuiobjectmembervisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/removeuiobjectmembervisitor.cpp similarity index 100% rename from src/plugins/qmldesigner/core/filemanager/removeuiobjectmembervisitor.cpp rename to src/plugins/qmldesigner/designercore/filemanager/removeuiobjectmembervisitor.cpp diff --git a/src/plugins/qmldesigner/core/filemanager/removeuiobjectmembervisitor.h b/src/plugins/qmldesigner/designercore/filemanager/removeuiobjectmembervisitor.h similarity index 100% rename from src/plugins/qmldesigner/core/filemanager/removeuiobjectmembervisitor.h rename to src/plugins/qmldesigner/designercore/filemanager/removeuiobjectmembervisitor.h diff --git a/src/plugins/qmldesigner/core/include/abstractproperty.h b/src/plugins/qmldesigner/designercore/include/abstractproperty.h similarity index 100% rename from src/plugins/qmldesigner/core/include/abstractproperty.h rename to src/plugins/qmldesigner/designercore/include/abstractproperty.h diff --git a/src/plugins/qmldesigner/core/include/abstractview.h b/src/plugins/qmldesigner/designercore/include/abstractview.h similarity index 100% rename from src/plugins/qmldesigner/core/include/abstractview.h rename to src/plugins/qmldesigner/designercore/include/abstractview.h diff --git a/src/plugins/qmldesigner/core/include/anchorline.h b/src/plugins/qmldesigner/designercore/include/anchorline.h similarity index 100% rename from src/plugins/qmldesigner/core/include/anchorline.h rename to src/plugins/qmldesigner/designercore/include/anchorline.h diff --git a/src/plugins/qmldesigner/core/include/basetexteditmodifier.h b/src/plugins/qmldesigner/designercore/include/basetexteditmodifier.h similarity index 100% rename from src/plugins/qmldesigner/core/include/basetexteditmodifier.h rename to src/plugins/qmldesigner/designercore/include/basetexteditmodifier.h diff --git a/src/plugins/qmldesigner/core/include/bindingproperty.h b/src/plugins/qmldesigner/designercore/include/bindingproperty.h similarity index 100% rename from src/plugins/qmldesigner/core/include/bindingproperty.h rename to src/plugins/qmldesigner/designercore/include/bindingproperty.h diff --git a/src/plugins/qmldesigner/core/include/bytearraymodifier.h b/src/plugins/qmldesigner/designercore/include/bytearraymodifier.h similarity index 100% rename from src/plugins/qmldesigner/core/include/bytearraymodifier.h rename to src/plugins/qmldesigner/designercore/include/bytearraymodifier.h diff --git a/src/plugins/qmldesigner/core/include/componenttextmodifier.h b/src/plugins/qmldesigner/designercore/include/componenttextmodifier.h similarity index 100% rename from src/plugins/qmldesigner/core/include/componenttextmodifier.h rename to src/plugins/qmldesigner/designercore/include/componenttextmodifier.h diff --git a/src/plugins/qmldesigner/core/include/corelib_global.h b/src/plugins/qmldesigner/designercore/include/corelib_global.h similarity index 100% rename from src/plugins/qmldesigner/core/include/corelib_global.h rename to src/plugins/qmldesigner/designercore/include/corelib_global.h diff --git a/src/plugins/qmldesigner/core/include/customnotifications.h b/src/plugins/qmldesigner/designercore/include/customnotifications.h similarity index 100% rename from src/plugins/qmldesigner/core/include/customnotifications.h rename to src/plugins/qmldesigner/designercore/include/customnotifications.h diff --git a/src/plugins/qmldesigner/core/include/enumeratormetainfo.h b/src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h similarity index 100% rename from src/plugins/qmldesigner/core/include/enumeratormetainfo.h rename to src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h diff --git a/src/plugins/qmldesigner/core/include/exception.h b/src/plugins/qmldesigner/designercore/include/exception.h similarity index 100% rename from src/plugins/qmldesigner/core/include/exception.h rename to src/plugins/qmldesigner/designercore/include/exception.h diff --git a/src/plugins/qmldesigner/core/include/forwardview.h b/src/plugins/qmldesigner/designercore/include/forwardview.h similarity index 100% rename from src/plugins/qmldesigner/core/include/forwardview.h rename to src/plugins/qmldesigner/designercore/include/forwardview.h diff --git a/src/plugins/qmldesigner/core/include/import.h b/src/plugins/qmldesigner/designercore/include/import.h similarity index 100% rename from src/plugins/qmldesigner/core/include/import.h rename to src/plugins/qmldesigner/designercore/include/import.h diff --git a/src/plugins/qmldesigner/core/include/invalidargumentexception.h b/src/plugins/qmldesigner/designercore/include/invalidargumentexception.h similarity index 100% rename from src/plugins/qmldesigner/core/include/invalidargumentexception.h rename to src/plugins/qmldesigner/designercore/include/invalidargumentexception.h diff --git a/src/plugins/qmldesigner/core/include/invalididexception.h b/src/plugins/qmldesigner/designercore/include/invalididexception.h similarity index 100% rename from src/plugins/qmldesigner/core/include/invalididexception.h rename to src/plugins/qmldesigner/designercore/include/invalididexception.h diff --git a/src/plugins/qmldesigner/core/include/invalidmetainfoexception.h b/src/plugins/qmldesigner/designercore/include/invalidmetainfoexception.h similarity index 100% rename from src/plugins/qmldesigner/core/include/invalidmetainfoexception.h rename to src/plugins/qmldesigner/designercore/include/invalidmetainfoexception.h diff --git a/src/plugins/qmldesigner/core/include/invalidmodelnodeexception.h b/src/plugins/qmldesigner/designercore/include/invalidmodelnodeexception.h similarity index 100% rename from src/plugins/qmldesigner/core/include/invalidmodelnodeexception.h rename to src/plugins/qmldesigner/designercore/include/invalidmodelnodeexception.h diff --git a/src/plugins/qmldesigner/core/include/invalidmodelstateexception.h b/src/plugins/qmldesigner/designercore/include/invalidmodelstateexception.h similarity index 100% rename from src/plugins/qmldesigner/core/include/invalidmodelstateexception.h rename to src/plugins/qmldesigner/designercore/include/invalidmodelstateexception.h diff --git a/src/plugins/qmldesigner/core/include/invalidnodeinstanceexception.h b/src/plugins/qmldesigner/designercore/include/invalidnodeinstanceexception.h similarity index 100% rename from src/plugins/qmldesigner/core/include/invalidnodeinstanceexception.h rename to src/plugins/qmldesigner/designercore/include/invalidnodeinstanceexception.h diff --git a/src/plugins/qmldesigner/core/include/invalidnodestateexception.h b/src/plugins/qmldesigner/designercore/include/invalidnodestateexception.h similarity index 100% rename from src/plugins/qmldesigner/core/include/invalidnodestateexception.h rename to src/plugins/qmldesigner/designercore/include/invalidnodestateexception.h diff --git a/src/plugins/qmldesigner/core/include/invalidpropertyexception.h b/src/plugins/qmldesigner/designercore/include/invalidpropertyexception.h similarity index 100% rename from src/plugins/qmldesigner/core/include/invalidpropertyexception.h rename to src/plugins/qmldesigner/designercore/include/invalidpropertyexception.h diff --git a/src/plugins/qmldesigner/core/include/invalidqmlsourceexception.h b/src/plugins/qmldesigner/designercore/include/invalidqmlsourceexception.h similarity index 100% rename from src/plugins/qmldesigner/core/include/invalidqmlsourceexception.h rename to src/plugins/qmldesigner/designercore/include/invalidqmlsourceexception.h diff --git a/src/plugins/qmldesigner/core/include/invalidreparentingexception.h b/src/plugins/qmldesigner/designercore/include/invalidreparentingexception.h similarity index 100% rename from src/plugins/qmldesigner/core/include/invalidreparentingexception.h rename to src/plugins/qmldesigner/designercore/include/invalidreparentingexception.h diff --git a/src/plugins/qmldesigner/core/include/invalidslideindexexception.h b/src/plugins/qmldesigner/designercore/include/invalidslideindexexception.h similarity index 100% rename from src/plugins/qmldesigner/core/include/invalidslideindexexception.h rename to src/plugins/qmldesigner/designercore/include/invalidslideindexexception.h diff --git a/src/plugins/qmldesigner/core/include/itemlibraryinfo.h b/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h similarity index 100% rename from src/plugins/qmldesigner/core/include/itemlibraryinfo.h rename to src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h diff --git a/src/plugins/qmldesigner/core/include/iwidgetplugin.h b/src/plugins/qmldesigner/designercore/include/iwidgetplugin.h similarity index 100% rename from src/plugins/qmldesigner/core/include/iwidgetplugin.h rename to src/plugins/qmldesigner/designercore/include/iwidgetplugin.h diff --git a/src/plugins/qmldesigner/core/include/mathutils.h b/src/plugins/qmldesigner/designercore/include/mathutils.h similarity index 100% rename from src/plugins/qmldesigner/core/include/mathutils.h rename to src/plugins/qmldesigner/designercore/include/mathutils.h diff --git a/src/plugins/qmldesigner/core/include/metainfo.h b/src/plugins/qmldesigner/designercore/include/metainfo.h similarity index 100% rename from src/plugins/qmldesigner/core/include/metainfo.h rename to src/plugins/qmldesigner/designercore/include/metainfo.h diff --git a/src/plugins/qmldesigner/core/include/metainfoparser.h b/src/plugins/qmldesigner/designercore/include/metainfoparser.h similarity index 100% rename from src/plugins/qmldesigner/core/include/metainfoparser.h rename to src/plugins/qmldesigner/designercore/include/metainfoparser.h diff --git a/src/plugins/qmldesigner/core/include/model.h b/src/plugins/qmldesigner/designercore/include/model.h similarity index 100% rename from src/plugins/qmldesigner/core/include/model.h rename to src/plugins/qmldesigner/designercore/include/model.h diff --git a/src/plugins/qmldesigner/core/include/modelmerger.h b/src/plugins/qmldesigner/designercore/include/modelmerger.h similarity index 100% rename from src/plugins/qmldesigner/core/include/modelmerger.h rename to src/plugins/qmldesigner/designercore/include/modelmerger.h diff --git a/src/plugins/qmldesigner/core/include/modelnode.h b/src/plugins/qmldesigner/designercore/include/modelnode.h similarity index 100% rename from src/plugins/qmldesigner/core/include/modelnode.h rename to src/plugins/qmldesigner/designercore/include/modelnode.h diff --git a/src/plugins/qmldesigner/core/include/modelnodepositionstorage.h b/src/plugins/qmldesigner/designercore/include/modelnodepositionstorage.h similarity index 100% rename from src/plugins/qmldesigner/core/include/modelnodepositionstorage.h rename to src/plugins/qmldesigner/designercore/include/modelnodepositionstorage.h diff --git a/src/plugins/qmldesigner/core/include/modelutilities.h b/src/plugins/qmldesigner/designercore/include/modelutilities.h similarity index 100% rename from src/plugins/qmldesigner/core/include/modelutilities.h rename to src/plugins/qmldesigner/designercore/include/modelutilities.h diff --git a/src/plugins/qmldesigner/core/include/modificationgroupexception.h b/src/plugins/qmldesigner/designercore/include/modificationgroupexception.h similarity index 100% rename from src/plugins/qmldesigner/core/include/modificationgroupexception.h rename to src/plugins/qmldesigner/designercore/include/modificationgroupexception.h diff --git a/src/plugins/qmldesigner/core/include/modificationgrouptoken.h b/src/plugins/qmldesigner/designercore/include/modificationgrouptoken.h similarity index 100% rename from src/plugins/qmldesigner/core/include/modificationgrouptoken.h rename to src/plugins/qmldesigner/designercore/include/modificationgrouptoken.h diff --git a/src/plugins/qmldesigner/core/include/noanchoringpossibleexception.h b/src/plugins/qmldesigner/designercore/include/noanchoringpossibleexception.h similarity index 100% rename from src/plugins/qmldesigner/core/include/noanchoringpossibleexception.h rename to src/plugins/qmldesigner/designercore/include/noanchoringpossibleexception.h diff --git a/src/plugins/qmldesigner/core/include/nodeabstractproperty.h b/src/plugins/qmldesigner/designercore/include/nodeabstractproperty.h similarity index 100% rename from src/plugins/qmldesigner/core/include/nodeabstractproperty.h rename to src/plugins/qmldesigner/designercore/include/nodeabstractproperty.h diff --git a/src/plugins/qmldesigner/core/include/nodeanchors.h b/src/plugins/qmldesigner/designercore/include/nodeanchors.h similarity index 100% rename from src/plugins/qmldesigner/core/include/nodeanchors.h rename to src/plugins/qmldesigner/designercore/include/nodeanchors.h diff --git a/src/plugins/qmldesigner/core/include/nodeinstance.h b/src/plugins/qmldesigner/designercore/include/nodeinstance.h similarity index 100% rename from src/plugins/qmldesigner/core/include/nodeinstance.h rename to src/plugins/qmldesigner/designercore/include/nodeinstance.h diff --git a/src/plugins/qmldesigner/core/include/nodeinstanceview.h b/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h similarity index 100% rename from src/plugins/qmldesigner/core/include/nodeinstanceview.h rename to src/plugins/qmldesigner/designercore/include/nodeinstanceview.h diff --git a/src/plugins/qmldesigner/core/include/nodelistproperty.h b/src/plugins/qmldesigner/designercore/include/nodelistproperty.h similarity index 100% rename from src/plugins/qmldesigner/core/include/nodelistproperty.h rename to src/plugins/qmldesigner/designercore/include/nodelistproperty.h diff --git a/src/plugins/qmldesigner/core/include/nodemetainfo.h b/src/plugins/qmldesigner/designercore/include/nodemetainfo.h similarity index 100% rename from src/plugins/qmldesigner/core/include/nodemetainfo.h rename to src/plugins/qmldesigner/designercore/include/nodemetainfo.h diff --git a/src/plugins/qmldesigner/core/include/nodeproperty.h b/src/plugins/qmldesigner/designercore/include/nodeproperty.h similarity index 100% rename from src/plugins/qmldesigner/core/include/nodeproperty.h rename to src/plugins/qmldesigner/designercore/include/nodeproperty.h diff --git a/src/plugins/qmldesigner/core/include/notimplementedexception.h b/src/plugins/qmldesigner/designercore/include/notimplementedexception.h similarity index 100% rename from src/plugins/qmldesigner/core/include/notimplementedexception.h rename to src/plugins/qmldesigner/designercore/include/notimplementedexception.h diff --git a/src/plugins/qmldesigner/core/include/objectpropertybinding.h b/src/plugins/qmldesigner/designercore/include/objectpropertybinding.h similarity index 100% rename from src/plugins/qmldesigner/core/include/objectpropertybinding.h rename to src/plugins/qmldesigner/designercore/include/objectpropertybinding.h diff --git a/src/plugins/qmldesigner/core/include/plaintexteditmodifier.h b/src/plugins/qmldesigner/designercore/include/plaintexteditmodifier.h similarity index 100% rename from src/plugins/qmldesigner/core/include/plaintexteditmodifier.h rename to src/plugins/qmldesigner/designercore/include/plaintexteditmodifier.h diff --git a/src/plugins/qmldesigner/core/include/propertybinding.h b/src/plugins/qmldesigner/designercore/include/propertybinding.h similarity index 100% rename from src/plugins/qmldesigner/core/include/propertybinding.h rename to src/plugins/qmldesigner/designercore/include/propertybinding.h diff --git a/src/plugins/qmldesigner/core/include/propertycontainer.h b/src/plugins/qmldesigner/designercore/include/propertycontainer.h similarity index 100% rename from src/plugins/qmldesigner/core/include/propertycontainer.h rename to src/plugins/qmldesigner/designercore/include/propertycontainer.h diff --git a/src/plugins/qmldesigner/core/include/propertymetainfo.h b/src/plugins/qmldesigner/designercore/include/propertymetainfo.h similarity index 100% rename from src/plugins/qmldesigner/core/include/propertymetainfo.h rename to src/plugins/qmldesigner/designercore/include/propertymetainfo.h diff --git a/src/plugins/qmldesigner/core/include/propertynode.h b/src/plugins/qmldesigner/designercore/include/propertynode.h similarity index 100% rename from src/plugins/qmldesigner/core/include/propertynode.h rename to src/plugins/qmldesigner/designercore/include/propertynode.h diff --git a/src/plugins/qmldesigner/core/include/qmlanchors.h b/src/plugins/qmldesigner/designercore/include/qmlanchors.h similarity index 100% rename from src/plugins/qmldesigner/core/include/qmlanchors.h rename to src/plugins/qmldesigner/designercore/include/qmlanchors.h diff --git a/src/plugins/qmldesigner/core/include/qmlchangeset.h b/src/plugins/qmldesigner/designercore/include/qmlchangeset.h similarity index 100% rename from src/plugins/qmldesigner/core/include/qmlchangeset.h rename to src/plugins/qmldesigner/designercore/include/qmlchangeset.h diff --git a/src/plugins/qmldesigner/core/include/qmlitemnode.h b/src/plugins/qmldesigner/designercore/include/qmlitemnode.h similarity index 100% rename from src/plugins/qmldesigner/core/include/qmlitemnode.h rename to src/plugins/qmldesigner/designercore/include/qmlitemnode.h diff --git a/src/plugins/qmldesigner/core/include/qmlmodelnodefacade.h b/src/plugins/qmldesigner/designercore/include/qmlmodelnodefacade.h similarity index 100% rename from src/plugins/qmldesigner/core/include/qmlmodelnodefacade.h rename to src/plugins/qmldesigner/designercore/include/qmlmodelnodefacade.h diff --git a/src/plugins/qmldesigner/core/include/qmlmodelview.h b/src/plugins/qmldesigner/designercore/include/qmlmodelview.h similarity index 100% rename from src/plugins/qmldesigner/core/include/qmlmodelview.h rename to src/plugins/qmldesigner/designercore/include/qmlmodelview.h diff --git a/src/plugins/qmldesigner/core/include/qmlobjectnode.h b/src/plugins/qmldesigner/designercore/include/qmlobjectnode.h similarity index 100% rename from src/plugins/qmldesigner/core/include/qmlobjectnode.h rename to src/plugins/qmldesigner/designercore/include/qmlobjectnode.h diff --git a/src/plugins/qmldesigner/core/include/qmlstate.h b/src/plugins/qmldesigner/designercore/include/qmlstate.h similarity index 100% rename from src/plugins/qmldesigner/core/include/qmlstate.h rename to src/plugins/qmldesigner/designercore/include/qmlstate.h diff --git a/src/plugins/qmldesigner/core/include/removebasestateexception.h b/src/plugins/qmldesigner/designercore/include/removebasestateexception.h similarity index 100% rename from src/plugins/qmldesigner/core/include/removebasestateexception.h rename to src/plugins/qmldesigner/designercore/include/removebasestateexception.h diff --git a/src/plugins/qmldesigner/core/include/replaceallobjectdefinitionsvisitor.h b/src/plugins/qmldesigner/designercore/include/replaceallobjectdefinitionsvisitor.h similarity index 100% rename from src/plugins/qmldesigner/core/include/replaceallobjectdefinitionsvisitor.h rename to src/plugins/qmldesigner/designercore/include/replaceallobjectdefinitionsvisitor.h diff --git a/src/plugins/qmldesigner/core/include/rewriterview.h b/src/plugins/qmldesigner/designercore/include/rewriterview.h similarity index 100% rename from src/plugins/qmldesigner/core/include/rewriterview.h rename to src/plugins/qmldesigner/designercore/include/rewriterview.h diff --git a/src/plugins/qmldesigner/core/include/rewritingexception.h b/src/plugins/qmldesigner/designercore/include/rewritingexception.h similarity index 100% rename from src/plugins/qmldesigner/core/include/rewritingexception.h rename to src/plugins/qmldesigner/designercore/include/rewritingexception.h diff --git a/src/plugins/qmldesigner/core/include/stylemanager.h b/src/plugins/qmldesigner/designercore/include/stylemanager.h similarity index 100% rename from src/plugins/qmldesigner/core/include/stylemanager.h rename to src/plugins/qmldesigner/designercore/include/stylemanager.h diff --git a/src/plugins/qmldesigner/core/include/subcomponentmanager.h b/src/plugins/qmldesigner/designercore/include/subcomponentmanager.h similarity index 100% rename from src/plugins/qmldesigner/core/include/subcomponentmanager.h rename to src/plugins/qmldesigner/designercore/include/subcomponentmanager.h diff --git a/src/plugins/qmldesigner/core/include/textmodifier.h b/src/plugins/qmldesigner/designercore/include/textmodifier.h similarity index 100% rename from src/plugins/qmldesigner/core/include/textmodifier.h rename to src/plugins/qmldesigner/designercore/include/textmodifier.h diff --git a/src/plugins/qmldesigner/core/include/variantproperty.h b/src/plugins/qmldesigner/designercore/include/variantproperty.h similarity index 100% rename from src/plugins/qmldesigner/core/include/variantproperty.h rename to src/plugins/qmldesigner/designercore/include/variantproperty.h diff --git a/src/plugins/qmldesigner/core/include/widgetplugin_helper.h b/src/plugins/qmldesigner/designercore/include/widgetplugin_helper.h similarity index 100% rename from src/plugins/qmldesigner/core/include/widgetplugin_helper.h rename to src/plugins/qmldesigner/designercore/include/widgetplugin_helper.h diff --git a/src/plugins/qmldesigner/core/include/widgetqueryview.h b/src/plugins/qmldesigner/designercore/include/widgetqueryview.h similarity index 100% rename from src/plugins/qmldesigner/core/include/widgetqueryview.h rename to src/plugins/qmldesigner/designercore/include/widgetqueryview.h diff --git a/src/plugins/qmldesigner/core/instances/behaviornodeinstance.cpp b/src/plugins/qmldesigner/designercore/instances/behaviornodeinstance.cpp similarity index 100% rename from src/plugins/qmldesigner/core/instances/behaviornodeinstance.cpp rename to src/plugins/qmldesigner/designercore/instances/behaviornodeinstance.cpp diff --git a/src/plugins/qmldesigner/core/instances/behaviornodeinstance.h b/src/plugins/qmldesigner/designercore/instances/behaviornodeinstance.h similarity index 100% rename from src/plugins/qmldesigner/core/instances/behaviornodeinstance.h rename to src/plugins/qmldesigner/designercore/instances/behaviornodeinstance.h diff --git a/src/plugins/qmldesigner/core/instances/componentnodeinstance.cpp b/src/plugins/qmldesigner/designercore/instances/componentnodeinstance.cpp similarity index 100% rename from src/plugins/qmldesigner/core/instances/componentnodeinstance.cpp rename to src/plugins/qmldesigner/designercore/instances/componentnodeinstance.cpp diff --git a/src/plugins/qmldesigner/core/instances/componentnodeinstance.h b/src/plugins/qmldesigner/designercore/instances/componentnodeinstance.h similarity index 100% rename from src/plugins/qmldesigner/core/instances/componentnodeinstance.h rename to src/plugins/qmldesigner/designercore/instances/componentnodeinstance.h diff --git a/src/plugins/qmldesigner/core/instances/dummynodeinstance.cpp b/src/plugins/qmldesigner/designercore/instances/dummynodeinstance.cpp similarity index 100% rename from src/plugins/qmldesigner/core/instances/dummynodeinstance.cpp rename to src/plugins/qmldesigner/designercore/instances/dummynodeinstance.cpp diff --git a/src/plugins/qmldesigner/core/instances/dummynodeinstance.h b/src/plugins/qmldesigner/designercore/instances/dummynodeinstance.h similarity index 100% rename from src/plugins/qmldesigner/core/instances/dummynodeinstance.h rename to src/plugins/qmldesigner/designercore/instances/dummynodeinstance.h diff --git a/src/plugins/qmldesigner/core/instances/graphicsobjectnodeinstance.cpp b/src/plugins/qmldesigner/designercore/instances/graphicsobjectnodeinstance.cpp similarity index 100% rename from src/plugins/qmldesigner/core/instances/graphicsobjectnodeinstance.cpp rename to src/plugins/qmldesigner/designercore/instances/graphicsobjectnodeinstance.cpp diff --git a/src/plugins/qmldesigner/core/instances/graphicsobjectnodeinstance.h b/src/plugins/qmldesigner/designercore/instances/graphicsobjectnodeinstance.h similarity index 100% rename from src/plugins/qmldesigner/core/instances/graphicsobjectnodeinstance.h rename to src/plugins/qmldesigner/designercore/instances/graphicsobjectnodeinstance.h diff --git a/src/plugins/qmldesigner/core/instances/graphicsscenenodeinstance.cpp b/src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp similarity index 100% rename from src/plugins/qmldesigner/core/instances/graphicsscenenodeinstance.cpp rename to src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp diff --git a/src/plugins/qmldesigner/core/instances/graphicsscenenodeinstance.h b/src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h similarity index 100% rename from src/plugins/qmldesigner/core/instances/graphicsscenenodeinstance.h rename to src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h diff --git a/src/plugins/qmldesigner/core/instances/graphicsviewnodeinstance.cpp b/src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp similarity index 100% rename from src/plugins/qmldesigner/core/instances/graphicsviewnodeinstance.cpp rename to src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp diff --git a/src/plugins/qmldesigner/core/instances/graphicsviewnodeinstance.h b/src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.h similarity index 100% rename from src/plugins/qmldesigner/core/instances/graphicsviewnodeinstance.h rename to src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.h diff --git a/src/plugins/qmldesigner/core/instances/graphicswidgetnodeinstance.cpp b/src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp similarity index 100% rename from src/plugins/qmldesigner/core/instances/graphicswidgetnodeinstance.cpp rename to src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp diff --git a/src/plugins/qmldesigner/core/instances/graphicswidgetnodeinstance.h b/src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h similarity index 100% rename from src/plugins/qmldesigner/core/instances/graphicswidgetnodeinstance.h rename to src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h diff --git a/src/plugins/qmldesigner/core/instances/nodeinstance.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp similarity index 100% rename from src/plugins/qmldesigner/core/instances/nodeinstance.cpp rename to src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp diff --git a/src/plugins/qmldesigner/core/instances/nodeinstancemetaobject.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstancemetaobject.cpp similarity index 100% rename from src/plugins/qmldesigner/core/instances/nodeinstancemetaobject.cpp rename to src/plugins/qmldesigner/designercore/instances/nodeinstancemetaobject.cpp diff --git a/src/plugins/qmldesigner/core/instances/nodeinstancemetaobject.h b/src/plugins/qmldesigner/designercore/instances/nodeinstancemetaobject.h similarity index 100% rename from src/plugins/qmldesigner/core/instances/nodeinstancemetaobject.h rename to src/plugins/qmldesigner/designercore/instances/nodeinstancemetaobject.h diff --git a/src/plugins/qmldesigner/core/instances/nodeinstancesignalspy.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstancesignalspy.cpp similarity index 100% rename from src/plugins/qmldesigner/core/instances/nodeinstancesignalspy.cpp rename to src/plugins/qmldesigner/designercore/instances/nodeinstancesignalspy.cpp diff --git a/src/plugins/qmldesigner/core/instances/nodeinstancesignalspy.h b/src/plugins/qmldesigner/designercore/instances/nodeinstancesignalspy.h similarity index 100% rename from src/plugins/qmldesigner/core/instances/nodeinstancesignalspy.h rename to src/plugins/qmldesigner/designercore/instances/nodeinstancesignalspy.h diff --git a/src/plugins/qmldesigner/core/instances/nodeinstanceview.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp similarity index 100% rename from src/plugins/qmldesigner/core/instances/nodeinstanceview.cpp rename to src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp diff --git a/src/plugins/qmldesigner/core/instances/objectnodeinstance.cpp b/src/plugins/qmldesigner/designercore/instances/objectnodeinstance.cpp similarity index 100% rename from src/plugins/qmldesigner/core/instances/objectnodeinstance.cpp rename to src/plugins/qmldesigner/designercore/instances/objectnodeinstance.cpp diff --git a/src/plugins/qmldesigner/core/instances/objectnodeinstance.h b/src/plugins/qmldesigner/designercore/instances/objectnodeinstance.h similarity index 100% rename from src/plugins/qmldesigner/core/instances/objectnodeinstance.h rename to src/plugins/qmldesigner/designercore/instances/objectnodeinstance.h diff --git a/src/plugins/qmldesigner/core/instances/proxywidgetnodeinstance.cpp b/src/plugins/qmldesigner/designercore/instances/proxywidgetnodeinstance.cpp similarity index 100% rename from src/plugins/qmldesigner/core/instances/proxywidgetnodeinstance.cpp rename to src/plugins/qmldesigner/designercore/instances/proxywidgetnodeinstance.cpp diff --git a/src/plugins/qmldesigner/core/instances/proxywidgetnodeinstance.h b/src/plugins/qmldesigner/designercore/instances/proxywidgetnodeinstance.h similarity index 100% rename from src/plugins/qmldesigner/core/instances/proxywidgetnodeinstance.h rename to src/plugins/qmldesigner/designercore/instances/proxywidgetnodeinstance.h diff --git a/src/plugins/qmldesigner/core/instances/qmlgraphicsitemnodeinstance.cpp b/src/plugins/qmldesigner/designercore/instances/qmlgraphicsitemnodeinstance.cpp similarity index 100% rename from src/plugins/qmldesigner/core/instances/qmlgraphicsitemnodeinstance.cpp rename to src/plugins/qmldesigner/designercore/instances/qmlgraphicsitemnodeinstance.cpp diff --git a/src/plugins/qmldesigner/core/instances/qmlgraphicsitemnodeinstance.h b/src/plugins/qmldesigner/designercore/instances/qmlgraphicsitemnodeinstance.h similarity index 100% rename from src/plugins/qmldesigner/core/instances/qmlgraphicsitemnodeinstance.h rename to src/plugins/qmldesigner/designercore/instances/qmlgraphicsitemnodeinstance.h diff --git a/src/plugins/qmldesigner/core/instances/qmlpropertychangesnodeinstance.cpp b/src/plugins/qmldesigner/designercore/instances/qmlpropertychangesnodeinstance.cpp similarity index 100% rename from src/plugins/qmldesigner/core/instances/qmlpropertychangesnodeinstance.cpp rename to src/plugins/qmldesigner/designercore/instances/qmlpropertychangesnodeinstance.cpp diff --git a/src/plugins/qmldesigner/core/instances/qmlpropertychangesnodeinstance.h b/src/plugins/qmldesigner/designercore/instances/qmlpropertychangesnodeinstance.h similarity index 100% rename from src/plugins/qmldesigner/core/instances/qmlpropertychangesnodeinstance.h rename to src/plugins/qmldesigner/designercore/instances/qmlpropertychangesnodeinstance.h diff --git a/src/plugins/qmldesigner/core/instances/qmlstatenodeinstance.cpp b/src/plugins/qmldesigner/designercore/instances/qmlstatenodeinstance.cpp similarity index 100% rename from src/plugins/qmldesigner/core/instances/qmlstatenodeinstance.cpp rename to src/plugins/qmldesigner/designercore/instances/qmlstatenodeinstance.cpp diff --git a/src/plugins/qmldesigner/core/instances/qmlstatenodeinstance.h b/src/plugins/qmldesigner/designercore/instances/qmlstatenodeinstance.h similarity index 100% rename from src/plugins/qmldesigner/core/instances/qmlstatenodeinstance.h rename to src/plugins/qmldesigner/designercore/instances/qmlstatenodeinstance.h diff --git a/src/plugins/qmldesigner/core/instances/qmltransitionnodeinstance.cpp b/src/plugins/qmldesigner/designercore/instances/qmltransitionnodeinstance.cpp similarity index 100% rename from src/plugins/qmldesigner/core/instances/qmltransitionnodeinstance.cpp rename to src/plugins/qmldesigner/designercore/instances/qmltransitionnodeinstance.cpp diff --git a/src/plugins/qmldesigner/core/instances/qmltransitionnodeinstance.h b/src/plugins/qmldesigner/designercore/instances/qmltransitionnodeinstance.h similarity index 100% rename from src/plugins/qmldesigner/core/instances/qmltransitionnodeinstance.h rename to src/plugins/qmldesigner/designercore/instances/qmltransitionnodeinstance.h diff --git a/src/plugins/qmldesigner/core/instances/qmlviewnodeinstance.cpp b/src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp similarity index 100% rename from src/plugins/qmldesigner/core/instances/qmlviewnodeinstance.cpp rename to src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp diff --git a/src/plugins/qmldesigner/core/instances/qmlviewnodeinstance.h b/src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.h similarity index 100% rename from src/plugins/qmldesigner/core/instances/qmlviewnodeinstance.h rename to src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.h diff --git a/src/plugins/qmldesigner/core/instances/widgetnodeinstance.cpp b/src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp similarity index 100% rename from src/plugins/qmldesigner/core/instances/widgetnodeinstance.cpp rename to src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp diff --git a/src/plugins/qmldesigner/core/instances/widgetnodeinstance.h b/src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h similarity index 100% rename from src/plugins/qmldesigner/core/instances/widgetnodeinstance.h rename to src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h diff --git a/src/plugins/qmldesigner/core/iwidgetplugin.pri b/src/plugins/qmldesigner/designercore/iwidgetplugin.pri similarity index 100% rename from src/plugins/qmldesigner/core/iwidgetplugin.pri rename to src/plugins/qmldesigner/designercore/iwidgetplugin.pri diff --git a/src/plugins/qmldesigner/core/metainfo/enumeratormetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp similarity index 100% rename from src/plugins/qmldesigner/core/metainfo/enumeratormetainfo.cpp rename to src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp diff --git a/src/plugins/qmldesigner/core/metainfo/gui.metainfo b/src/plugins/qmldesigner/designercore/metainfo/gui.metainfo similarity index 100% rename from src/plugins/qmldesigner/core/metainfo/gui.metainfo rename to src/plugins/qmldesigner/designercore/metainfo/gui.metainfo diff --git a/src/plugins/qmldesigner/core/metainfo/itemlibraryinfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp similarity index 100% rename from src/plugins/qmldesigner/core/metainfo/itemlibraryinfo.cpp rename to src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp diff --git a/src/plugins/qmldesigner/core/metainfo/metainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp similarity index 100% rename from src/plugins/qmldesigner/core/metainfo/metainfo.cpp rename to src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp diff --git a/src/plugins/qmldesigner/core/metainfo/metainfoparser.cpp b/src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp similarity index 100% rename from src/plugins/qmldesigner/core/metainfo/metainfoparser.cpp rename to src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp diff --git a/src/plugins/qmldesigner/core/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp similarity index 100% rename from src/plugins/qmldesigner/core/metainfo/nodemetainfo.cpp rename to src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp diff --git a/src/plugins/qmldesigner/core/metainfo/propertymetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp similarity index 100% rename from src/plugins/qmldesigner/core/metainfo/propertymetainfo.cpp rename to src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp diff --git a/src/plugins/qmldesigner/core/metainfo/subcomponentmanager.cpp b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp similarity index 100% rename from src/plugins/qmldesigner/core/metainfo/subcomponentmanager.cpp rename to src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp diff --git a/src/plugins/qmldesigner/core/model/abstractproperty.cpp b/src/plugins/qmldesigner/designercore/model/abstractproperty.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/abstractproperty.cpp rename to src/plugins/qmldesigner/designercore/model/abstractproperty.cpp diff --git a/src/plugins/qmldesigner/core/model/abstractview.cpp b/src/plugins/qmldesigner/designercore/model/abstractview.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/abstractview.cpp rename to src/plugins/qmldesigner/designercore/model/abstractview.cpp diff --git a/src/plugins/qmldesigner/core/model/anchorline.cpp b/src/plugins/qmldesigner/designercore/model/anchorline.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/anchorline.cpp rename to src/plugins/qmldesigner/designercore/model/anchorline.cpp diff --git a/src/plugins/qmldesigner/core/model/basetexteditmodifier.cpp b/src/plugins/qmldesigner/designercore/model/basetexteditmodifier.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/basetexteditmodifier.cpp rename to src/plugins/qmldesigner/designercore/model/basetexteditmodifier.cpp diff --git a/src/plugins/qmldesigner/core/model/bindingproperty.cpp b/src/plugins/qmldesigner/designercore/model/bindingproperty.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/bindingproperty.cpp rename to src/plugins/qmldesigner/designercore/model/bindingproperty.cpp diff --git a/src/plugins/qmldesigner/core/model/bytearraymodifier.cpp b/src/plugins/qmldesigner/designercore/model/bytearraymodifier.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/bytearraymodifier.cpp rename to src/plugins/qmldesigner/designercore/model/bytearraymodifier.cpp diff --git a/src/plugins/qmldesigner/core/model/componenttextmodifier.cpp b/src/plugins/qmldesigner/designercore/model/componenttextmodifier.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/componenttextmodifier.cpp rename to src/plugins/qmldesigner/designercore/model/componenttextmodifier.cpp diff --git a/src/plugins/qmldesigner/core/model/copyhelper.cpp b/src/plugins/qmldesigner/designercore/model/copyhelper.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/copyhelper.cpp rename to src/plugins/qmldesigner/designercore/model/copyhelper.cpp diff --git a/src/plugins/qmldesigner/core/model/copyhelper.h b/src/plugins/qmldesigner/designercore/model/copyhelper.h similarity index 100% rename from src/plugins/qmldesigner/core/model/copyhelper.h rename to src/plugins/qmldesigner/designercore/model/copyhelper.h diff --git a/src/plugins/qmldesigner/core/model/import.cpp b/src/plugins/qmldesigner/designercore/model/import.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/import.cpp rename to src/plugins/qmldesigner/designercore/model/import.cpp diff --git a/src/plugins/qmldesigner/core/model/internalbindingproperty.cpp b/src/plugins/qmldesigner/designercore/model/internalbindingproperty.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/internalbindingproperty.cpp rename to src/plugins/qmldesigner/designercore/model/internalbindingproperty.cpp diff --git a/src/plugins/qmldesigner/core/model/internalbindingproperty.h b/src/plugins/qmldesigner/designercore/model/internalbindingproperty.h similarity index 100% rename from src/plugins/qmldesigner/core/model/internalbindingproperty.h rename to src/plugins/qmldesigner/designercore/model/internalbindingproperty.h diff --git a/src/plugins/qmldesigner/core/model/internalnode.cpp b/src/plugins/qmldesigner/designercore/model/internalnode.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/internalnode.cpp rename to src/plugins/qmldesigner/designercore/model/internalnode.cpp diff --git a/src/plugins/qmldesigner/core/model/internalnode_p.h b/src/plugins/qmldesigner/designercore/model/internalnode_p.h similarity index 100% rename from src/plugins/qmldesigner/core/model/internalnode_p.h rename to src/plugins/qmldesigner/designercore/model/internalnode_p.h diff --git a/src/plugins/qmldesigner/core/model/internalnodeabstractproperty.cpp b/src/plugins/qmldesigner/designercore/model/internalnodeabstractproperty.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/internalnodeabstractproperty.cpp rename to src/plugins/qmldesigner/designercore/model/internalnodeabstractproperty.cpp diff --git a/src/plugins/qmldesigner/core/model/internalnodeabstractproperty.h b/src/plugins/qmldesigner/designercore/model/internalnodeabstractproperty.h similarity index 100% rename from src/plugins/qmldesigner/core/model/internalnodeabstractproperty.h rename to src/plugins/qmldesigner/designercore/model/internalnodeabstractproperty.h diff --git a/src/plugins/qmldesigner/core/model/internalnodelistproperty.cpp b/src/plugins/qmldesigner/designercore/model/internalnodelistproperty.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/internalnodelistproperty.cpp rename to src/plugins/qmldesigner/designercore/model/internalnodelistproperty.cpp diff --git a/src/plugins/qmldesigner/core/model/internalnodelistproperty.h b/src/plugins/qmldesigner/designercore/model/internalnodelistproperty.h similarity index 100% rename from src/plugins/qmldesigner/core/model/internalnodelistproperty.h rename to src/plugins/qmldesigner/designercore/model/internalnodelistproperty.h diff --git a/src/plugins/qmldesigner/core/model/internalnodeproperty.cpp b/src/plugins/qmldesigner/designercore/model/internalnodeproperty.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/internalnodeproperty.cpp rename to src/plugins/qmldesigner/designercore/model/internalnodeproperty.cpp diff --git a/src/plugins/qmldesigner/core/model/internalnodeproperty.h b/src/plugins/qmldesigner/designercore/model/internalnodeproperty.h similarity index 100% rename from src/plugins/qmldesigner/core/model/internalnodeproperty.h rename to src/plugins/qmldesigner/designercore/model/internalnodeproperty.h diff --git a/src/plugins/qmldesigner/core/model/internalproperty.cpp b/src/plugins/qmldesigner/designercore/model/internalproperty.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/internalproperty.cpp rename to src/plugins/qmldesigner/designercore/model/internalproperty.cpp diff --git a/src/plugins/qmldesigner/core/model/internalproperty.h b/src/plugins/qmldesigner/designercore/model/internalproperty.h similarity index 100% rename from src/plugins/qmldesigner/core/model/internalproperty.h rename to src/plugins/qmldesigner/designercore/model/internalproperty.h diff --git a/src/plugins/qmldesigner/core/model/internalvariantproperty.cpp b/src/plugins/qmldesigner/designercore/model/internalvariantproperty.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/internalvariantproperty.cpp rename to src/plugins/qmldesigner/designercore/model/internalvariantproperty.cpp diff --git a/src/plugins/qmldesigner/core/model/internalvariantproperty.h b/src/plugins/qmldesigner/designercore/model/internalvariantproperty.h similarity index 100% rename from src/plugins/qmldesigner/core/model/internalvariantproperty.h rename to src/plugins/qmldesigner/designercore/model/internalvariantproperty.h diff --git a/src/plugins/qmldesigner/core/model/model.cpp b/src/plugins/qmldesigner/designercore/model/model.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/model.cpp rename to src/plugins/qmldesigner/designercore/model/model.cpp diff --git a/src/plugins/qmldesigner/core/model/model_p.h b/src/plugins/qmldesigner/designercore/model/model_p.h similarity index 100% rename from src/plugins/qmldesigner/core/model/model_p.h rename to src/plugins/qmldesigner/designercore/model/model_p.h diff --git a/src/plugins/qmldesigner/core/model/modelmerger.cpp b/src/plugins/qmldesigner/designercore/model/modelmerger.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/modelmerger.cpp rename to src/plugins/qmldesigner/designercore/model/modelmerger.cpp diff --git a/src/plugins/qmldesigner/core/model/modelnode.cpp b/src/plugins/qmldesigner/designercore/model/modelnode.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/modelnode.cpp rename to src/plugins/qmldesigner/designercore/model/modelnode.cpp diff --git a/src/plugins/qmldesigner/core/model/modelnodepositionrecalculator.cpp b/src/plugins/qmldesigner/designercore/model/modelnodepositionrecalculator.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/modelnodepositionrecalculator.cpp rename to src/plugins/qmldesigner/designercore/model/modelnodepositionrecalculator.cpp diff --git a/src/plugins/qmldesigner/core/model/modelnodepositionrecalculator.h b/src/plugins/qmldesigner/designercore/model/modelnodepositionrecalculator.h similarity index 100% rename from src/plugins/qmldesigner/core/model/modelnodepositionrecalculator.h rename to src/plugins/qmldesigner/designercore/model/modelnodepositionrecalculator.h diff --git a/src/plugins/qmldesigner/core/model/modelnodepositionstorage.cpp b/src/plugins/qmldesigner/designercore/model/modelnodepositionstorage.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/modelnodepositionstorage.cpp rename to src/plugins/qmldesigner/designercore/model/modelnodepositionstorage.cpp diff --git a/src/plugins/qmldesigner/core/model/modelrewriter.cpp b/src/plugins/qmldesigner/designercore/model/modelrewriter.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/modelrewriter.cpp rename to src/plugins/qmldesigner/designercore/model/modelrewriter.cpp diff --git a/src/plugins/qmldesigner/core/model/modelrewriter.h b/src/plugins/qmldesigner/designercore/model/modelrewriter.h similarity index 100% rename from src/plugins/qmldesigner/core/model/modelrewriter.h rename to src/plugins/qmldesigner/designercore/model/modelrewriter.h diff --git a/src/plugins/qmldesigner/core/model/modeltotextmerger.cpp b/src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/modeltotextmerger.cpp rename to src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp diff --git a/src/plugins/qmldesigner/core/model/modeltotextmerger.h b/src/plugins/qmldesigner/designercore/model/modeltotextmerger.h similarity index 100% rename from src/plugins/qmldesigner/core/model/modeltotextmerger.h rename to src/plugins/qmldesigner/designercore/model/modeltotextmerger.h diff --git a/src/plugins/qmldesigner/core/model/modelutilities.cpp b/src/plugins/qmldesigner/designercore/model/modelutilities.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/modelutilities.cpp rename to src/plugins/qmldesigner/designercore/model/modelutilities.cpp diff --git a/src/plugins/qmldesigner/core/model/modificationgrouptoken.cpp b/src/plugins/qmldesigner/designercore/model/modificationgrouptoken.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/modificationgrouptoken.cpp rename to src/plugins/qmldesigner/designercore/model/modificationgrouptoken.cpp diff --git a/src/plugins/qmldesigner/core/model/nodeabstractproperty.cpp b/src/plugins/qmldesigner/designercore/model/nodeabstractproperty.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/nodeabstractproperty.cpp rename to src/plugins/qmldesigner/designercore/model/nodeabstractproperty.cpp diff --git a/src/plugins/qmldesigner/core/model/nodeanchors.cpp b/src/plugins/qmldesigner/designercore/model/nodeanchors.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/nodeanchors.cpp rename to src/plugins/qmldesigner/designercore/model/nodeanchors.cpp diff --git a/src/plugins/qmldesigner/core/model/nodelistproperty.cpp b/src/plugins/qmldesigner/designercore/model/nodelistproperty.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/nodelistproperty.cpp rename to src/plugins/qmldesigner/designercore/model/nodelistproperty.cpp diff --git a/src/plugins/qmldesigner/core/model/nodeproperty.cpp b/src/plugins/qmldesigner/designercore/model/nodeproperty.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/nodeproperty.cpp rename to src/plugins/qmldesigner/designercore/model/nodeproperty.cpp diff --git a/src/plugins/qmldesigner/core/model/objectpropertybinding.cpp b/src/plugins/qmldesigner/designercore/model/objectpropertybinding.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/objectpropertybinding.cpp rename to src/plugins/qmldesigner/designercore/model/objectpropertybinding.cpp diff --git a/src/plugins/qmldesigner/core/model/painteventfilter.cpp b/src/plugins/qmldesigner/designercore/model/painteventfilter.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/painteventfilter.cpp rename to src/plugins/qmldesigner/designercore/model/painteventfilter.cpp diff --git a/src/plugins/qmldesigner/core/model/painteventfilter_p.h b/src/plugins/qmldesigner/designercore/model/painteventfilter_p.h similarity index 100% rename from src/plugins/qmldesigner/core/model/painteventfilter_p.h rename to src/plugins/qmldesigner/designercore/model/painteventfilter_p.h diff --git a/src/plugins/qmldesigner/core/model/parsedqml.cpp b/src/plugins/qmldesigner/designercore/model/parsedqml.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/parsedqml.cpp rename to src/plugins/qmldesigner/designercore/model/parsedqml.cpp diff --git a/src/plugins/qmldesigner/core/model/parsedqml.h b/src/plugins/qmldesigner/designercore/model/parsedqml.h similarity index 100% rename from src/plugins/qmldesigner/core/model/parsedqml.h rename to src/plugins/qmldesigner/designercore/model/parsedqml.h diff --git a/src/plugins/qmldesigner/core/model/paster.cpp b/src/plugins/qmldesigner/designercore/model/paster.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/paster.cpp rename to src/plugins/qmldesigner/designercore/model/paster.cpp diff --git a/src/plugins/qmldesigner/core/model/paster.h b/src/plugins/qmldesigner/designercore/model/paster.h similarity index 100% rename from src/plugins/qmldesigner/core/model/paster.h rename to src/plugins/qmldesigner/designercore/model/paster.h diff --git a/src/plugins/qmldesigner/core/model/plaintexteditmodifier.cpp b/src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/plaintexteditmodifier.cpp rename to src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp diff --git a/src/plugins/qmldesigner/core/model/propertybinding.cpp b/src/plugins/qmldesigner/designercore/model/propertybinding.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/propertybinding.cpp rename to src/plugins/qmldesigner/designercore/model/propertybinding.cpp diff --git a/src/plugins/qmldesigner/core/model/propertycontainer.cpp b/src/plugins/qmldesigner/designercore/model/propertycontainer.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/propertycontainer.cpp rename to src/plugins/qmldesigner/designercore/model/propertycontainer.cpp diff --git a/src/plugins/qmldesigner/core/model/propertynode.cpp b/src/plugins/qmldesigner/designercore/model/propertynode.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/propertynode.cpp rename to src/plugins/qmldesigner/designercore/model/propertynode.cpp diff --git a/src/plugins/qmldesigner/core/model/propertyparser.cpp b/src/plugins/qmldesigner/designercore/model/propertyparser.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/propertyparser.cpp rename to src/plugins/qmldesigner/designercore/model/propertyparser.cpp diff --git a/src/plugins/qmldesigner/core/model/propertyparser.h b/src/plugins/qmldesigner/designercore/model/propertyparser.h similarity index 100% rename from src/plugins/qmldesigner/core/model/propertyparser.h rename to src/plugins/qmldesigner/designercore/model/propertyparser.h diff --git a/src/plugins/qmldesigner/core/model/qmlanchors.cpp b/src/plugins/qmldesigner/designercore/model/qmlanchors.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/qmlanchors.cpp rename to src/plugins/qmldesigner/designercore/model/qmlanchors.cpp diff --git a/src/plugins/qmldesigner/core/model/qmlchangeset.cpp b/src/plugins/qmldesigner/designercore/model/qmlchangeset.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/qmlchangeset.cpp rename to src/plugins/qmldesigner/designercore/model/qmlchangeset.cpp diff --git a/src/plugins/qmldesigner/core/model/qmlitemnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/qmlitemnode.cpp rename to src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp diff --git a/src/plugins/qmldesigner/core/model/qmlmodelnodefacade.cpp b/src/plugins/qmldesigner/designercore/model/qmlmodelnodefacade.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/qmlmodelnodefacade.cpp rename to src/plugins/qmldesigner/designercore/model/qmlmodelnodefacade.cpp diff --git a/src/plugins/qmldesigner/core/model/qmlmodelview.cpp b/src/plugins/qmldesigner/designercore/model/qmlmodelview.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/qmlmodelview.cpp rename to src/plugins/qmldesigner/designercore/model/qmlmodelview.cpp diff --git a/src/plugins/qmldesigner/core/model/qmlobjectnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/qmlobjectnode.cpp rename to src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp diff --git a/src/plugins/qmldesigner/core/model/qmlstate.cpp b/src/plugins/qmldesigner/designercore/model/qmlstate.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/qmlstate.cpp rename to src/plugins/qmldesigner/designercore/model/qmlstate.cpp diff --git a/src/plugins/qmldesigner/core/model/qmltextgenerator.cpp b/src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/qmltextgenerator.cpp rename to src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp diff --git a/src/plugins/qmldesigner/core/model/qmltextgenerator.h b/src/plugins/qmldesigner/designercore/model/qmltextgenerator.h similarity index 100% rename from src/plugins/qmldesigner/core/model/qmltextgenerator.h rename to src/plugins/qmldesigner/designercore/model/qmltextgenerator.h diff --git a/src/plugins/qmldesigner/core/model/rewriteaction.cpp b/src/plugins/qmldesigner/designercore/model/rewriteaction.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/rewriteaction.cpp rename to src/plugins/qmldesigner/designercore/model/rewriteaction.cpp diff --git a/src/plugins/qmldesigner/core/model/rewriteaction.h b/src/plugins/qmldesigner/designercore/model/rewriteaction.h similarity index 100% rename from src/plugins/qmldesigner/core/model/rewriteaction.h rename to src/plugins/qmldesigner/designercore/model/rewriteaction.h diff --git a/src/plugins/qmldesigner/core/model/rewriteactioncompressor.cpp b/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/rewriteactioncompressor.cpp rename to src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp diff --git a/src/plugins/qmldesigner/core/model/rewriteactioncompressor.h b/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.h similarity index 100% rename from src/plugins/qmldesigner/core/model/rewriteactioncompressor.h rename to src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.h diff --git a/src/plugins/qmldesigner/core/model/rewriterview.cpp b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/rewriterview.cpp rename to src/plugins/qmldesigner/designercore/model/rewriterview.cpp diff --git a/src/plugins/qmldesigner/core/model/textmodifier.cpp b/src/plugins/qmldesigner/designercore/model/textmodifier.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/textmodifier.cpp rename to src/plugins/qmldesigner/designercore/model/textmodifier.cpp diff --git a/src/plugins/qmldesigner/core/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/texttomodelmerger.cpp rename to src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp diff --git a/src/plugins/qmldesigner/core/model/texttomodelmerger.h b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h similarity index 100% rename from src/plugins/qmldesigner/core/model/texttomodelmerger.h rename to src/plugins/qmldesigner/designercore/model/texttomodelmerger.h diff --git a/src/plugins/qmldesigner/core/model/variantparser.cpp b/src/plugins/qmldesigner/designercore/model/variantparser.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/variantparser.cpp rename to src/plugins/qmldesigner/designercore/model/variantparser.cpp diff --git a/src/plugins/qmldesigner/core/model/variantparser.h b/src/plugins/qmldesigner/designercore/model/variantparser.h similarity index 100% rename from src/plugins/qmldesigner/core/model/variantparser.h rename to src/plugins/qmldesigner/designercore/model/variantparser.h diff --git a/src/plugins/qmldesigner/core/model/variantproperty.cpp b/src/plugins/qmldesigner/designercore/model/variantproperty.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/variantproperty.cpp rename to src/plugins/qmldesigner/designercore/model/variantproperty.cpp diff --git a/src/plugins/qmldesigner/core/model/viewlogger.cpp b/src/plugins/qmldesigner/designercore/model/viewlogger.cpp similarity index 100% rename from src/plugins/qmldesigner/core/model/viewlogger.cpp rename to src/plugins/qmldesigner/designercore/model/viewlogger.cpp diff --git a/src/plugins/qmldesigner/core/model/viewlogger.h b/src/plugins/qmldesigner/designercore/model/viewlogger.h similarity index 100% rename from src/plugins/qmldesigner/core/model/viewlogger.h rename to src/plugins/qmldesigner/designercore/model/viewlogger.h diff --git a/src/plugins/qmldesigner/core/pluginmanager/widgetpluginmanager.cpp b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.cpp similarity index 100% rename from src/plugins/qmldesigner/core/pluginmanager/widgetpluginmanager.cpp rename to src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.cpp diff --git a/src/plugins/qmldesigner/core/pluginmanager/widgetpluginmanager.h b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.h similarity index 100% rename from src/plugins/qmldesigner/core/pluginmanager/widgetpluginmanager.h rename to src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.h diff --git a/src/plugins/qmldesigner/core/pluginmanager/widgetpluginpath.cpp b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.cpp similarity index 100% rename from src/plugins/qmldesigner/core/pluginmanager/widgetpluginpath.cpp rename to src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.cpp diff --git a/src/plugins/qmldesigner/core/pluginmanager/widgetpluginpath.h b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.h similarity index 100% rename from src/plugins/qmldesigner/core/pluginmanager/widgetpluginpath.h rename to src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.h diff --git a/src/plugins/qmldesigner/core/preview/stylemanager.cpp b/src/plugins/qmldesigner/designercore/preview/stylemanager.cpp similarity index 100% rename from src/plugins/qmldesigner/core/preview/stylemanager.cpp rename to src/plugins/qmldesigner/designercore/preview/stylemanager.cpp diff --git a/src/plugins/qmldesigner/core/rewritertransaction.cpp b/src/plugins/qmldesigner/designercore/rewritertransaction.cpp similarity index 100% rename from src/plugins/qmldesigner/core/rewritertransaction.cpp rename to src/plugins/qmldesigner/designercore/rewritertransaction.cpp diff --git a/src/plugins/qmldesigner/core/rewritertransaction.h b/src/plugins/qmldesigner/designercore/rewritertransaction.h similarity index 100% rename from src/plugins/qmldesigner/core/rewritertransaction.h rename to src/plugins/qmldesigner/designercore/rewritertransaction.h diff --git a/src/plugins/qmldesigner/fxplugin/fxplugin.pri b/src/plugins/qmldesigner/fxplugin/fxplugin.pri index 9760d0e7227..5d880bd6c5d 100644 --- a/src/plugins/qmldesigner/fxplugin/fxplugin.pri +++ b/src/plugins/qmldesigner/fxplugin/fxplugin.pri @@ -5,12 +5,12 @@ CONFIG += plugin QT += script \ declarative -include (../core/iwidgetplugin.pri) +include (../designercore/iwidgetplugin.pri) DEFINES += FX_LIBRARY SOURCES += $$PWD/fxplugin.cpp -HEADERS += $$PWD/fxplugin.h $$PWD/../core/include/iwidgetplugin.h +HEADERS += $$PWD/fxplugin.h $$PWD/../designercore/include/iwidgetplugin.h RESOURCES += $$PWD/fxplugin.qrc diff --git a/src/plugins/qmldesigner/qmldesignerplugin.pro b/src/plugins/qmldesigner/qmldesignerplugin.pro index 3049f449a1c..fc965672277 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.pro +++ b/src/plugins/qmldesigner/qmldesignerplugin.pro @@ -6,7 +6,7 @@ include(../private_headers.pri) include(qmldesigner_dependencies.pri) include(../qmljseditor/qmljseditor.pri) -include(core/core.pri) +include(designercore/designercore.pri) include(components/integration/integration.pri) include(components/propertyeditor/propertyeditor.pri) include(components/formeditor/formeditor.pri) diff --git a/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp b/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp index 0ec6e66812a..e3deb4d1eee 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp @@ -249,6 +249,8 @@ S60CreatePackageStepConfigWidget::S60CreatePackageStepConfigWidget(S60CreatePack : BuildStepConfigWidget(), m_signStep(signStep) { m_ui.setupUi(this); + m_ui.signaturePath->setExpectedKind(Utils::PathChooser::File); + m_ui.keyFilePath->setExpectedKind(Utils::PathChooser::File); updateUi(); connect(m_ui.customCertificateButton, SIGNAL(clicked()), this, SLOT(updateFromUi())); diff --git a/src/plugins/welcome/communitywelcomepagewidget.cpp b/src/plugins/welcome/communitywelcomepagewidget.cpp index d9043daf83d..e489761824b 100644 --- a/src/plugins/welcome/communitywelcomepagewidget.cpp +++ b/src/plugins/welcome/communitywelcomepagewidget.cpp @@ -90,9 +90,12 @@ CommunityWelcomePageWidget::CommunityWelcomePageWidget(QWidget *parent) : connect(ui->supportSitesTreeWidget, SIGNAL(activated(QString)), SLOT(slotUrlClicked(QString))); connect(m_rssFetcher, SIGNAL(newsItemReady(QString, QString, QString)), - ui->newsTreeWidget, SLOT(addNewsItem(QString, QString, QString))); + ui->newsTreeWidget, SLOT(addNewsItem(QString, QString, QString)), Qt::QueuedConnection); + connect(this, SIGNAL(startRssFetching(QUrl)), m_rssFetcher, SLOT(fetch(QUrl)), Qt::QueuedConnection); + //: Add localized feed here only if one exists - m_rssFetcher->fetch(QUrl(tr("http://labs.trolltech.com/blogs/feed"))); + m_rssFetcher->start(QThread::LowestPriority); + emit startRssFetching(QUrl(tr("http://labs.trolltech.com/blogs/feed"))); populateWelcomeTreeWidget(supportSites, sizeof(supportSites)/sizeof(Site), ui->supportSitesTreeWidget); populateWelcomeTreeWidget(sites, sizeof(sites)/sizeof(Site), ui->miscSitesTreeWidget); @@ -100,6 +103,8 @@ CommunityWelcomePageWidget::CommunityWelcomePageWidget(QWidget *parent) : CommunityWelcomePageWidget::~CommunityWelcomePageWidget() { + m_rssFetcher->exit(); + m_rssFetcher->wait(); delete m_rssFetcher; delete ui; } diff --git a/src/plugins/welcome/communitywelcomepagewidget.h b/src/plugins/welcome/communitywelcomepagewidget.h index 228ff5ccc22..3bfb9d72bea 100644 --- a/src/plugins/welcome/communitywelcomepagewidget.h +++ b/src/plugins/welcome/communitywelcomepagewidget.h @@ -32,6 +32,10 @@ #include +QT_BEGIN_NAMESPACE +class QUrl; +QT_END_NAMESPACE + namespace Welcome { namespace Internal { @@ -49,6 +53,9 @@ public: explicit CommunityWelcomePageWidget(QWidget *parent = 0); ~CommunityWelcomePageWidget(); +signals: + void startRssFetching(const QUrl& url); + private slots: void slotUrlClicked(const QString &data); diff --git a/src/plugins/welcome/rssfetcher.cpp b/src/plugins/welcome/rssfetcher.cpp index ecd1140910b..7b272e35f31 100644 --- a/src/plugins/welcome/rssfetcher.cpp +++ b/src/plugins/welcome/rssfetcher.cpp @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -113,15 +114,22 @@ static const QString getOsString() return osString; } -RSSFetcher::RSSFetcher(int maxItems, QObject *parent) - : QObject(parent), m_maxItems(maxItems), m_items(0) +RSSFetcher::RSSFetcher(int maxItems) + : QThread(0), m_maxItems(maxItems), m_items(0), m_networkAccessManager(0) { + moveToThread(this); } RSSFetcher::~RSSFetcher() { } +void RSSFetcher::run() +{ + exec(); + delete m_networkAccessManager; +} + void RSSFetcher::fetch(const QUrl &url) { QString agentStr = QString::fromLatin1("Qt-Creator/%1 (QHttp %2; %3; %4; %5 bit)") @@ -130,9 +138,9 @@ void RSSFetcher::fetch(const QUrl &url) .arg(QSysInfo::WordSize); QNetworkRequest req(url); req.setRawHeader("User-Agent", agentStr.toLatin1()); - if (m_networkAccessManager.isNull()) { - m_networkAccessManager.reset(new QNetworkAccessManager); - connect(m_networkAccessManager.data(), SIGNAL(finished(QNetworkReply*)), + if (!m_networkAccessManager) { + m_networkAccessManager = new QNetworkAccessManager; + connect(m_networkAccessManager, SIGNAL(finished(QNetworkReply*)), SLOT(fetchingFinished(QNetworkReply*))); } m_networkAccessManager->get(req); diff --git a/src/plugins/welcome/rssfetcher.h b/src/plugins/welcome/rssfetcher.h index db1fba88b6a..09c9db848e8 100644 --- a/src/plugins/welcome/rssfetcher.h +++ b/src/plugins/welcome/rssfetcher.h @@ -30,8 +30,7 @@ #ifndef RSSFETCHER_H #define RSSFETCHER_H -#include -#include +#include QT_BEGIN_NAMESPACE class QNetworkReply; @@ -43,11 +42,12 @@ QT_END_NAMESPACE namespace Welcome { namespace Internal { -class RSSFetcher : public QObject +class RSSFetcher : public QThread { Q_OBJECT public: - explicit RSSFetcher(int maxItems, QObject *parent = 0); + explicit RSSFetcher(int maxItems); + virtual void run(); virtual ~RSSFetcher(); signals: @@ -64,9 +64,9 @@ private: void parseXml(QIODevice *); const int m_maxItems; - - QScopedPointer m_networkAccessManager; int m_items; + + QNetworkAccessManager* m_networkAccessManager; }; } // namespace Welcome