diff --git a/src/libs/3rdparty/modeling/modeling.pri b/src/libs/3rdparty/modeling/modeling.pri deleted file mode 100644 index 1f01f22b535..00000000000 --- a/src/libs/3rdparty/modeling/modeling.pri +++ /dev/null @@ -1,6 +0,0 @@ - -INCLUDEPATH += $$PWD $$PWD/qtserialization/inc - -include(qstringparser/qstringparser.pri) -include(qtserialization/qtserialization.pri) -include(qmt/qmt.pri) diff --git a/src/libs/modelinglib/modelinglib.pro b/src/libs/modelinglib/modelinglib.pro index f973c536ec1..1cdddf87a5b 100644 --- a/src/libs/modelinglib/modelinglib.pro +++ b/src/libs/modelinglib/modelinglib.pro @@ -3,4 +3,8 @@ include(../../qtcreatorlibrary.pri) DEFINES += QMT_LIBRARY -include(../3rdparty/modeling/modeling.pri) +INCLUDEPATH += $$PWD $$PWD/qtserialization/inc + +include(qstringparser/qstringparser.pri) +include(qtserialization/qtserialization.pri) +include(qmt/qmt.pri) diff --git a/src/libs/modelinglib/modelinglib.qbs b/src/libs/modelinglib/modelinglib.qbs index 5c8f49f4c46..6df6663199d 100644 --- a/src/libs/modelinglib/modelinglib.qbs +++ b/src/libs/modelinglib/modelinglib.qbs @@ -5,8 +5,8 @@ QtcLibrary { cpp.defines: base.concat("QMT_LIBRARY") cpp.includePaths: base.concat([ - "../3rdparty/modeling", - "../3rdparty/modeling/qtserialization/inc", + ".", + "./qtserialization/inc", ]) Depends { name: "Qt.widgets" } @@ -14,7 +14,7 @@ QtcLibrary { Group { name: "Qmt" - prefix: "../3rdparty/modeling/qmt/" + prefix: "./qmt/" files: [ "config/configcontroller.cpp", "config/configcontroller.h", @@ -296,7 +296,7 @@ QtcLibrary { Group { name: "QStringParser" - prefix: "../3rdparty/modeling/qstringparser/" + prefix: "./qstringparser/" files: [ "qstringparser.cpp", "qstringparser.h", @@ -305,7 +305,7 @@ QtcLibrary { Group { name: "QtSerialization" - prefix: "../3rdparty/modeling/qtserialization/" + prefix: "./qtserialization/" files: [ "inc/qark/access.h", "inc/qark/archivebasics.h", @@ -334,8 +334,9 @@ QtcLibrary { Group { name: "Images" - prefix: "../3rdparty/modeling/qmt/resources/" + prefix: "./qmt/resources/" files: [ + "resources.qrc", "25x25/align-bottom.png", "25x25/align-horizontal.png", "25x25/align-left.png", @@ -362,8 +363,8 @@ QtcLibrary { Export { cpp.includePaths: [ - "../3rdparty/modeling", - "../3rdparty/modeling/qtserialization/inc" + ".", + "./qtserialization/inc" ] } } diff --git a/src/libs/modelinglib/modelinglib_dependencies.pri b/src/libs/modelinglib/modelinglib_dependencies.pri index a099e82fcd5..82bcc404447 100644 --- a/src/libs/modelinglib/modelinglib_dependencies.pri +++ b/src/libs/modelinglib/modelinglib_dependencies.pri @@ -1,4 +1,4 @@ QTC_LIB_NAME = Modeling QTC_LIB_DEPENDS += utils -INCLUDEPATH *= $$IDE_SOURCE_TREE/src/libs/3rdparty/modeling -INCLUDEPATH *= $$IDE_SOURCE_TREE/src/libs/3rdparty/modeling/qtserialization/inc +INCLUDEPATH *= $$IDE_SOURCE_TREE/src/libs/modelinglib +INCLUDEPATH *= $$IDE_SOURCE_TREE/src/libs/modelinglib/qtserialization/inc diff --git a/src/libs/3rdparty/modeling/qmt/config/configcontroller.cpp b/src/libs/modelinglib/qmt/config/configcontroller.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/config/configcontroller.cpp rename to src/libs/modelinglib/qmt/config/configcontroller.cpp diff --git a/src/libs/3rdparty/modeling/qmt/config/configcontroller.h b/src/libs/modelinglib/qmt/config/configcontroller.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/config/configcontroller.h rename to src/libs/modelinglib/qmt/config/configcontroller.h diff --git a/src/libs/3rdparty/modeling/qmt/config/sourcepos.cpp b/src/libs/modelinglib/qmt/config/sourcepos.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/config/sourcepos.cpp rename to src/libs/modelinglib/qmt/config/sourcepos.cpp diff --git a/src/libs/3rdparty/modeling/qmt/config/sourcepos.h b/src/libs/modelinglib/qmt/config/sourcepos.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/config/sourcepos.h rename to src/libs/modelinglib/qmt/config/sourcepos.h diff --git a/src/libs/3rdparty/modeling/qmt/config/stereotypedefinitionparser.cpp b/src/libs/modelinglib/qmt/config/stereotypedefinitionparser.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/config/stereotypedefinitionparser.cpp rename to src/libs/modelinglib/qmt/config/stereotypedefinitionparser.cpp diff --git a/src/libs/3rdparty/modeling/qmt/config/stereotypedefinitionparser.h b/src/libs/modelinglib/qmt/config/stereotypedefinitionparser.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/config/stereotypedefinitionparser.h rename to src/libs/modelinglib/qmt/config/stereotypedefinitionparser.h diff --git a/src/libs/3rdparty/modeling/qmt/config/stringtextsource.cpp b/src/libs/modelinglib/qmt/config/stringtextsource.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/config/stringtextsource.cpp rename to src/libs/modelinglib/qmt/config/stringtextsource.cpp diff --git a/src/libs/3rdparty/modeling/qmt/config/stringtextsource.h b/src/libs/modelinglib/qmt/config/stringtextsource.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/config/stringtextsource.h rename to src/libs/modelinglib/qmt/config/stringtextsource.h diff --git a/src/libs/3rdparty/modeling/qmt/config/textscanner.cpp b/src/libs/modelinglib/qmt/config/textscanner.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/config/textscanner.cpp rename to src/libs/modelinglib/qmt/config/textscanner.cpp diff --git a/src/libs/3rdparty/modeling/qmt/config/textscanner.h b/src/libs/modelinglib/qmt/config/textscanner.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/config/textscanner.h rename to src/libs/modelinglib/qmt/config/textscanner.h diff --git a/src/libs/3rdparty/modeling/qmt/config/textsource.h b/src/libs/modelinglib/qmt/config/textsource.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/config/textsource.h rename to src/libs/modelinglib/qmt/config/textsource.h diff --git a/src/libs/3rdparty/modeling/qmt/config/token.cpp b/src/libs/modelinglib/qmt/config/token.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/config/token.cpp rename to src/libs/modelinglib/qmt/config/token.cpp diff --git a/src/libs/3rdparty/modeling/qmt/config/token.h b/src/libs/modelinglib/qmt/config/token.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/config/token.h rename to src/libs/modelinglib/qmt/config/token.h diff --git a/src/libs/3rdparty/modeling/qmt/controller/container.h b/src/libs/modelinglib/qmt/controller/container.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/controller/container.h rename to src/libs/modelinglib/qmt/controller/container.h diff --git a/src/libs/3rdparty/modeling/qmt/controller/namecontroller.cpp b/src/libs/modelinglib/qmt/controller/namecontroller.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/controller/namecontroller.cpp rename to src/libs/modelinglib/qmt/controller/namecontroller.cpp diff --git a/src/libs/3rdparty/modeling/qmt/controller/namecontroller.h b/src/libs/modelinglib/qmt/controller/namecontroller.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/controller/namecontroller.h rename to src/libs/modelinglib/qmt/controller/namecontroller.h diff --git a/src/libs/3rdparty/modeling/qmt/controller/references.h b/src/libs/modelinglib/qmt/controller/references.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/controller/references.h rename to src/libs/modelinglib/qmt/controller/references.h diff --git a/src/libs/3rdparty/modeling/qmt/controller/selection.cpp b/src/libs/modelinglib/qmt/controller/selection.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/controller/selection.cpp rename to src/libs/modelinglib/qmt/controller/selection.cpp diff --git a/src/libs/3rdparty/modeling/qmt/controller/selection.h b/src/libs/modelinglib/qmt/controller/selection.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/controller/selection.h rename to src/libs/modelinglib/qmt/controller/selection.h diff --git a/src/libs/3rdparty/modeling/qmt/controller/undocommand.cpp b/src/libs/modelinglib/qmt/controller/undocommand.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/controller/undocommand.cpp rename to src/libs/modelinglib/qmt/controller/undocommand.cpp diff --git a/src/libs/3rdparty/modeling/qmt/controller/undocommand.h b/src/libs/modelinglib/qmt/controller/undocommand.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/controller/undocommand.h rename to src/libs/modelinglib/qmt/controller/undocommand.h diff --git a/src/libs/3rdparty/modeling/qmt/controller/undocontroller.cpp b/src/libs/modelinglib/qmt/controller/undocontroller.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/controller/undocontroller.cpp rename to src/libs/modelinglib/qmt/controller/undocontroller.cpp diff --git a/src/libs/3rdparty/modeling/qmt/controller/undocontroller.h b/src/libs/modelinglib/qmt/controller/undocontroller.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/controller/undocontroller.h rename to src/libs/modelinglib/qmt/controller/undocontroller.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram/dannotation.cpp b/src/libs/modelinglib/qmt/diagram/dannotation.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram/dannotation.cpp rename to src/libs/modelinglib/qmt/diagram/dannotation.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram/dannotation.h b/src/libs/modelinglib/qmt/diagram/dannotation.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram/dannotation.h rename to src/libs/modelinglib/qmt/diagram/dannotation.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram/dassociation.cpp b/src/libs/modelinglib/qmt/diagram/dassociation.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram/dassociation.cpp rename to src/libs/modelinglib/qmt/diagram/dassociation.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram/dassociation.h b/src/libs/modelinglib/qmt/diagram/dassociation.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram/dassociation.h rename to src/libs/modelinglib/qmt/diagram/dassociation.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram/dboundary.cpp b/src/libs/modelinglib/qmt/diagram/dboundary.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram/dboundary.cpp rename to src/libs/modelinglib/qmt/diagram/dboundary.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram/dboundary.h b/src/libs/modelinglib/qmt/diagram/dboundary.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram/dboundary.h rename to src/libs/modelinglib/qmt/diagram/dboundary.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram/dclass.cpp b/src/libs/modelinglib/qmt/diagram/dclass.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram/dclass.cpp rename to src/libs/modelinglib/qmt/diagram/dclass.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram/dclass.h b/src/libs/modelinglib/qmt/diagram/dclass.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram/dclass.h rename to src/libs/modelinglib/qmt/diagram/dclass.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram/dcomponent.cpp b/src/libs/modelinglib/qmt/diagram/dcomponent.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram/dcomponent.cpp rename to src/libs/modelinglib/qmt/diagram/dcomponent.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram/dcomponent.h b/src/libs/modelinglib/qmt/diagram/dcomponent.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram/dcomponent.h rename to src/libs/modelinglib/qmt/diagram/dcomponent.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram/dconstvisitor.h b/src/libs/modelinglib/qmt/diagram/dconstvisitor.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram/dconstvisitor.h rename to src/libs/modelinglib/qmt/diagram/dconstvisitor.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram/ddependency.cpp b/src/libs/modelinglib/qmt/diagram/ddependency.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram/ddependency.cpp rename to src/libs/modelinglib/qmt/diagram/ddependency.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram/ddependency.h b/src/libs/modelinglib/qmt/diagram/ddependency.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram/ddependency.h rename to src/libs/modelinglib/qmt/diagram/ddependency.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram/ddiagram.cpp b/src/libs/modelinglib/qmt/diagram/ddiagram.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram/ddiagram.cpp rename to src/libs/modelinglib/qmt/diagram/ddiagram.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram/ddiagram.h b/src/libs/modelinglib/qmt/diagram/ddiagram.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram/ddiagram.h rename to src/libs/modelinglib/qmt/diagram/ddiagram.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram/delement.cpp b/src/libs/modelinglib/qmt/diagram/delement.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram/delement.cpp rename to src/libs/modelinglib/qmt/diagram/delement.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram/delement.h b/src/libs/modelinglib/qmt/diagram/delement.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram/delement.h rename to src/libs/modelinglib/qmt/diagram/delement.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram/dinheritance.cpp b/src/libs/modelinglib/qmt/diagram/dinheritance.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram/dinheritance.cpp rename to src/libs/modelinglib/qmt/diagram/dinheritance.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram/dinheritance.h b/src/libs/modelinglib/qmt/diagram/dinheritance.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram/dinheritance.h rename to src/libs/modelinglib/qmt/diagram/dinheritance.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram/ditem.cpp b/src/libs/modelinglib/qmt/diagram/ditem.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram/ditem.cpp rename to src/libs/modelinglib/qmt/diagram/ditem.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram/ditem.h b/src/libs/modelinglib/qmt/diagram/ditem.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram/ditem.h rename to src/libs/modelinglib/qmt/diagram/ditem.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram/dobject.cpp b/src/libs/modelinglib/qmt/diagram/dobject.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram/dobject.cpp rename to src/libs/modelinglib/qmt/diagram/dobject.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram/dobject.h b/src/libs/modelinglib/qmt/diagram/dobject.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram/dobject.h rename to src/libs/modelinglib/qmt/diagram/dobject.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram/dpackage.cpp b/src/libs/modelinglib/qmt/diagram/dpackage.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram/dpackage.cpp rename to src/libs/modelinglib/qmt/diagram/dpackage.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram/dpackage.h b/src/libs/modelinglib/qmt/diagram/dpackage.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram/dpackage.h rename to src/libs/modelinglib/qmt/diagram/dpackage.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram/drelation.cpp b/src/libs/modelinglib/qmt/diagram/drelation.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram/drelation.cpp rename to src/libs/modelinglib/qmt/diagram/drelation.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram/drelation.h b/src/libs/modelinglib/qmt/diagram/drelation.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram/drelation.h rename to src/libs/modelinglib/qmt/diagram/drelation.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram/dvisitor.h b/src/libs/modelinglib/qmt/diagram/dvisitor.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram/dvisitor.h rename to src/libs/modelinglib/qmt/diagram/dvisitor.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_controller/dclonevisitor.cpp b/src/libs/modelinglib/qmt/diagram_controller/dclonevisitor.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_controller/dclonevisitor.cpp rename to src/libs/modelinglib/qmt/diagram_controller/dclonevisitor.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram_controller/dclonevisitor.h b/src/libs/modelinglib/qmt/diagram_controller/dclonevisitor.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_controller/dclonevisitor.h rename to src/libs/modelinglib/qmt/diagram_controller/dclonevisitor.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_controller/dcontainer.h b/src/libs/modelinglib/qmt/diagram_controller/dcontainer.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_controller/dcontainer.h rename to src/libs/modelinglib/qmt/diagram_controller/dcontainer.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_controller/dfactory.cpp b/src/libs/modelinglib/qmt/diagram_controller/dfactory.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_controller/dfactory.cpp rename to src/libs/modelinglib/qmt/diagram_controller/dfactory.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram_controller/dfactory.h b/src/libs/modelinglib/qmt/diagram_controller/dfactory.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_controller/dfactory.h rename to src/libs/modelinglib/qmt/diagram_controller/dfactory.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_controller/dflatassignmentvisitor.cpp b/src/libs/modelinglib/qmt/diagram_controller/dflatassignmentvisitor.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_controller/dflatassignmentvisitor.cpp rename to src/libs/modelinglib/qmt/diagram_controller/dflatassignmentvisitor.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram_controller/dflatassignmentvisitor.h b/src/libs/modelinglib/qmt/diagram_controller/dflatassignmentvisitor.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_controller/dflatassignmentvisitor.h rename to src/libs/modelinglib/qmt/diagram_controller/dflatassignmentvisitor.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_controller/diagramcontroller.cpp b/src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_controller/diagramcontroller.cpp rename to src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram_controller/diagramcontroller.h b/src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_controller/diagramcontroller.h rename to src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_controller/dreferences.h b/src/libs/modelinglib/qmt/diagram_controller/dreferences.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_controller/dreferences.h rename to src/libs/modelinglib/qmt/diagram_controller/dreferences.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_controller/dselection.h b/src/libs/modelinglib/qmt/diagram_controller/dselection.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_controller/dselection.h rename to src/libs/modelinglib/qmt/diagram_controller/dselection.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_controller/dupdatevisitor.cpp b/src/libs/modelinglib/qmt/diagram_controller/dupdatevisitor.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_controller/dupdatevisitor.cpp rename to src/libs/modelinglib/qmt/diagram_controller/dupdatevisitor.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram_controller/dupdatevisitor.h b/src/libs/modelinglib/qmt/diagram_controller/dupdatevisitor.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_controller/dupdatevisitor.h rename to src/libs/modelinglib/qmt/diagram_controller/dupdatevisitor.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_controller/dvoidvisitor.cpp b/src/libs/modelinglib/qmt/diagram_controller/dvoidvisitor.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_controller/dvoidvisitor.cpp rename to src/libs/modelinglib/qmt/diagram_controller/dvoidvisitor.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram_controller/dvoidvisitor.h b/src/libs/modelinglib/qmt/diagram_controller/dvoidvisitor.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_controller/dvoidvisitor.h rename to src/libs/modelinglib/qmt/diagram_controller/dvoidvisitor.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/alignable.h b/src/libs/modelinglib/qmt/diagram_scene/capabilities/alignable.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/alignable.h rename to src/libs/modelinglib/qmt/diagram_scene/capabilities/alignable.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/editable.h b/src/libs/modelinglib/qmt/diagram_scene/capabilities/editable.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/editable.h rename to src/libs/modelinglib/qmt/diagram_scene/capabilities/editable.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/intersectionable.h b/src/libs/modelinglib/qmt/diagram_scene/capabilities/intersectionable.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/intersectionable.h rename to src/libs/modelinglib/qmt/diagram_scene/capabilities/intersectionable.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/latchable.h b/src/libs/modelinglib/qmt/diagram_scene/capabilities/latchable.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/latchable.h rename to src/libs/modelinglib/qmt/diagram_scene/capabilities/latchable.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/moveable.h b/src/libs/modelinglib/qmt/diagram_scene/capabilities/moveable.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/moveable.h rename to src/libs/modelinglib/qmt/diagram_scene/capabilities/moveable.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/relationable.h b/src/libs/modelinglib/qmt/diagram_scene/capabilities/relationable.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/relationable.h rename to src/libs/modelinglib/qmt/diagram_scene/capabilities/relationable.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/resizable.h b/src/libs/modelinglib/qmt/diagram_scene/capabilities/resizable.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/resizable.h rename to src/libs/modelinglib/qmt/diagram_scene/capabilities/resizable.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/selectable.h b/src/libs/modelinglib/qmt/diagram_scene/capabilities/selectable.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/selectable.h rename to src/libs/modelinglib/qmt/diagram_scene/capabilities/selectable.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/windable.h b/src/libs/modelinglib/qmt/diagram_scene/capabilities/windable.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/windable.h rename to src/libs/modelinglib/qmt/diagram_scene/capabilities/windable.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/diagramgraphicsscene.cpp b/src/libs/modelinglib/qmt/diagram_scene/diagramgraphicsscene.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/diagramgraphicsscene.cpp rename to src/libs/modelinglib/qmt/diagram_scene/diagramgraphicsscene.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/diagramgraphicsscene.h b/src/libs/modelinglib/qmt/diagram_scene/diagramgraphicsscene.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/diagramgraphicsscene.h rename to src/libs/modelinglib/qmt/diagram_scene/diagramgraphicsscene.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/diagramsceneconstants.h b/src/libs/modelinglib/qmt/diagram_scene/diagramsceneconstants.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/diagramsceneconstants.h rename to src/libs/modelinglib/qmt/diagram_scene/diagramsceneconstants.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/diagramscenemodel.cpp b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/diagramscenemodel.cpp rename to src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/diagramscenemodel.h b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/diagramscenemodel.h rename to src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/diagramscenemodelitemvisitors.cpp b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodelitemvisitors.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/diagramscenemodelitemvisitors.cpp rename to src/libs/modelinglib/qmt/diagram_scene/diagramscenemodelitemvisitors.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/diagramscenemodelitemvisitors.h b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodelitemvisitors.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/diagramscenemodelitemvisitors.h rename to src/libs/modelinglib/qmt/diagram_scene/diagramscenemodelitemvisitors.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/annotationitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/annotationitem.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/items/annotationitem.cpp rename to src/libs/modelinglib/qmt/diagram_scene/items/annotationitem.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/annotationitem.h b/src/libs/modelinglib/qmt/diagram_scene/items/annotationitem.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/items/annotationitem.h rename to src/libs/modelinglib/qmt/diagram_scene/items/annotationitem.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/associationitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/associationitem.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/items/associationitem.cpp rename to src/libs/modelinglib/qmt/diagram_scene/items/associationitem.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/associationitem.h b/src/libs/modelinglib/qmt/diagram_scene/items/associationitem.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/items/associationitem.h rename to src/libs/modelinglib/qmt/diagram_scene/items/associationitem.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/boundaryitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/boundaryitem.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/items/boundaryitem.cpp rename to src/libs/modelinglib/qmt/diagram_scene/items/boundaryitem.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/boundaryitem.h b/src/libs/modelinglib/qmt/diagram_scene/items/boundaryitem.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/items/boundaryitem.h rename to src/libs/modelinglib/qmt/diagram_scene/items/boundaryitem.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/classitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/items/classitem.cpp rename to src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/classitem.h b/src/libs/modelinglib/qmt/diagram_scene/items/classitem.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/items/classitem.h rename to src/libs/modelinglib/qmt/diagram_scene/items/classitem.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/componentitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/componentitem.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/items/componentitem.cpp rename to src/libs/modelinglib/qmt/diagram_scene/items/componentitem.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/componentitem.h b/src/libs/modelinglib/qmt/diagram_scene/items/componentitem.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/items/componentitem.h rename to src/libs/modelinglib/qmt/diagram_scene/items/componentitem.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/diagramitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/diagramitem.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/items/diagramitem.cpp rename to src/libs/modelinglib/qmt/diagram_scene/items/diagramitem.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/diagramitem.h b/src/libs/modelinglib/qmt/diagram_scene/items/diagramitem.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/items/diagramitem.h rename to src/libs/modelinglib/qmt/diagram_scene/items/diagramitem.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/itemitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/itemitem.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/items/itemitem.cpp rename to src/libs/modelinglib/qmt/diagram_scene/items/itemitem.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/itemitem.h b/src/libs/modelinglib/qmt/diagram_scene/items/itemitem.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/items/itemitem.h rename to src/libs/modelinglib/qmt/diagram_scene/items/itemitem.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/objectitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/items/objectitem.cpp rename to src/libs/modelinglib/qmt/diagram_scene/items/objectitem.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/objectitem.h b/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/items/objectitem.h rename to src/libs/modelinglib/qmt/diagram_scene/items/objectitem.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/packageitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/packageitem.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/items/packageitem.cpp rename to src/libs/modelinglib/qmt/diagram_scene/items/packageitem.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/packageitem.h b/src/libs/modelinglib/qmt/diagram_scene/items/packageitem.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/items/packageitem.h rename to src/libs/modelinglib/qmt/diagram_scene/items/packageitem.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/relationitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/items/relationitem.cpp rename to src/libs/modelinglib/qmt/diagram_scene/items/relationitem.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/relationitem.h b/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/items/relationitem.h rename to src/libs/modelinglib/qmt/diagram_scene/items/relationitem.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/stereotypedisplayvisitor.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/stereotypedisplayvisitor.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/items/stereotypedisplayvisitor.cpp rename to src/libs/modelinglib/qmt/diagram_scene/items/stereotypedisplayvisitor.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/stereotypedisplayvisitor.h b/src/libs/modelinglib/qmt/diagram_scene/items/stereotypedisplayvisitor.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/items/stereotypedisplayvisitor.h rename to src/libs/modelinglib/qmt/diagram_scene/items/stereotypedisplayvisitor.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/latchcontroller.cpp b/src/libs/modelinglib/qmt/diagram_scene/latchcontroller.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/latchcontroller.cpp rename to src/libs/modelinglib/qmt/diagram_scene/latchcontroller.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/latchcontroller.h b/src/libs/modelinglib/qmt/diagram_scene/latchcontroller.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/latchcontroller.h rename to src/libs/modelinglib/qmt/diagram_scene/latchcontroller.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/alignbuttonsitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/alignbuttonsitem.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/parts/alignbuttonsitem.cpp rename to src/libs/modelinglib/qmt/diagram_scene/parts/alignbuttonsitem.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/alignbuttonsitem.h b/src/libs/modelinglib/qmt/diagram_scene/parts/alignbuttonsitem.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/parts/alignbuttonsitem.h rename to src/libs/modelinglib/qmt/diagram_scene/parts/alignbuttonsitem.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/alignlineitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/alignlineitem.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/parts/alignlineitem.cpp rename to src/libs/modelinglib/qmt/diagram_scene/parts/alignlineitem.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/alignlineitem.h b/src/libs/modelinglib/qmt/diagram_scene/parts/alignlineitem.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/parts/alignlineitem.h rename to src/libs/modelinglib/qmt/diagram_scene/parts/alignlineitem.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/arrowitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/arrowitem.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/parts/arrowitem.cpp rename to src/libs/modelinglib/qmt/diagram_scene/parts/arrowitem.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/arrowitem.h b/src/libs/modelinglib/qmt/diagram_scene/parts/arrowitem.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/parts/arrowitem.h rename to src/libs/modelinglib/qmt/diagram_scene/parts/arrowitem.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/contextlabelitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/contextlabelitem.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/parts/contextlabelitem.cpp rename to src/libs/modelinglib/qmt/diagram_scene/parts/contextlabelitem.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/contextlabelitem.h b/src/libs/modelinglib/qmt/diagram_scene/parts/contextlabelitem.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/parts/contextlabelitem.h rename to src/libs/modelinglib/qmt/diagram_scene/parts/contextlabelitem.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/customiconitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/customiconitem.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/parts/customiconitem.cpp rename to src/libs/modelinglib/qmt/diagram_scene/parts/customiconitem.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/customiconitem.h b/src/libs/modelinglib/qmt/diagram_scene/parts/customiconitem.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/parts/customiconitem.h rename to src/libs/modelinglib/qmt/diagram_scene/parts/customiconitem.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/editabletextitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/editabletextitem.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/parts/editabletextitem.cpp rename to src/libs/modelinglib/qmt/diagram_scene/parts/editabletextitem.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/editabletextitem.h b/src/libs/modelinglib/qmt/diagram_scene/parts/editabletextitem.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/parts/editabletextitem.h rename to src/libs/modelinglib/qmt/diagram_scene/parts/editabletextitem.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/pathselectionitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/parts/pathselectionitem.cpp rename to src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/pathselectionitem.h b/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/parts/pathselectionitem.h rename to src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/rectangularselectionitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/rectangularselectionitem.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/parts/rectangularselectionitem.cpp rename to src/libs/modelinglib/qmt/diagram_scene/parts/rectangularselectionitem.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/rectangularselectionitem.h b/src/libs/modelinglib/qmt/diagram_scene/parts/rectangularselectionitem.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/parts/rectangularselectionitem.h rename to src/libs/modelinglib/qmt/diagram_scene/parts/rectangularselectionitem.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/relationstarter.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/relationstarter.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/parts/relationstarter.cpp rename to src/libs/modelinglib/qmt/diagram_scene/parts/relationstarter.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/relationstarter.h b/src/libs/modelinglib/qmt/diagram_scene/parts/relationstarter.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/parts/relationstarter.h rename to src/libs/modelinglib/qmt/diagram_scene/parts/relationstarter.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/stereotypesitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/stereotypesitem.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/parts/stereotypesitem.cpp rename to src/libs/modelinglib/qmt/diagram_scene/parts/stereotypesitem.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/stereotypesitem.h b/src/libs/modelinglib/qmt/diagram_scene/parts/stereotypesitem.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/parts/stereotypesitem.h rename to src/libs/modelinglib/qmt/diagram_scene/parts/stereotypesitem.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/templateparameterbox.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/templateparameterbox.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/parts/templateparameterbox.cpp rename to src/libs/modelinglib/qmt/diagram_scene/parts/templateparameterbox.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/templateparameterbox.h b/src/libs/modelinglib/qmt/diagram_scene/parts/templateparameterbox.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_scene/parts/templateparameterbox.h rename to src/libs/modelinglib/qmt/diagram_scene/parts/templateparameterbox.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_ui/diagram_mime_types.h b/src/libs/modelinglib/qmt/diagram_ui/diagram_mime_types.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_ui/diagram_mime_types.h rename to src/libs/modelinglib/qmt/diagram_ui/diagram_mime_types.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_ui/diagramsmanager.cpp b/src/libs/modelinglib/qmt/diagram_ui/diagramsmanager.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_ui/diagramsmanager.cpp rename to src/libs/modelinglib/qmt/diagram_ui/diagramsmanager.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram_ui/diagramsmanager.h b/src/libs/modelinglib/qmt/diagram_ui/diagramsmanager.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_ui/diagramsmanager.h rename to src/libs/modelinglib/qmt/diagram_ui/diagramsmanager.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_ui/diagramsviewinterface.h b/src/libs/modelinglib/qmt/diagram_ui/diagramsviewinterface.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_ui/diagramsviewinterface.h rename to src/libs/modelinglib/qmt/diagram_ui/diagramsviewinterface.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_ui/sceneinspector.cpp b/src/libs/modelinglib/qmt/diagram_ui/sceneinspector.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_ui/sceneinspector.cpp rename to src/libs/modelinglib/qmt/diagram_ui/sceneinspector.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram_ui/sceneinspector.h b/src/libs/modelinglib/qmt/diagram_ui/sceneinspector.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_ui/sceneinspector.h rename to src/libs/modelinglib/qmt/diagram_ui/sceneinspector.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_widgets_ui/diagramsview.cpp b/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramsview.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_widgets_ui/diagramsview.cpp rename to src/libs/modelinglib/qmt/diagram_widgets_ui/diagramsview.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram_widgets_ui/diagramsview.h b/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramsview.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_widgets_ui/diagramsview.h rename to src/libs/modelinglib/qmt/diagram_widgets_ui/diagramsview.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_widgets_ui/diagramview.cpp b/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramview.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_widgets_ui/diagramview.cpp rename to src/libs/modelinglib/qmt/diagram_widgets_ui/diagramview.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram_widgets_ui/diagramview.h b/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramview.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_widgets_ui/diagramview.h rename to src/libs/modelinglib/qmt/diagram_widgets_ui/diagramview.h diff --git a/src/libs/3rdparty/modeling/qmt/diagram_widgets_ui/stackeddiagramsview.cpp b/src/libs/modelinglib/qmt/diagram_widgets_ui/stackeddiagramsview.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_widgets_ui/stackeddiagramsview.cpp rename to src/libs/modelinglib/qmt/diagram_widgets_ui/stackeddiagramsview.cpp diff --git a/src/libs/3rdparty/modeling/qmt/diagram_widgets_ui/stackeddiagramsview.h b/src/libs/modelinglib/qmt/diagram_widgets_ui/stackeddiagramsview.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/diagram_widgets_ui/stackeddiagramsview.h rename to src/libs/modelinglib/qmt/diagram_widgets_ui/stackeddiagramsview.h diff --git a/src/libs/3rdparty/modeling/qmt/document_controller/documentcontroller.cpp b/src/libs/modelinglib/qmt/document_controller/documentcontroller.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/document_controller/documentcontroller.cpp rename to src/libs/modelinglib/qmt/document_controller/documentcontroller.cpp diff --git a/src/libs/3rdparty/modeling/qmt/document_controller/documentcontroller.h b/src/libs/modelinglib/qmt/document_controller/documentcontroller.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/document_controller/documentcontroller.h rename to src/libs/modelinglib/qmt/document_controller/documentcontroller.h diff --git a/src/libs/3rdparty/modeling/qmt/infrastructure/contextmenuaction.cpp b/src/libs/modelinglib/qmt/infrastructure/contextmenuaction.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/infrastructure/contextmenuaction.cpp rename to src/libs/modelinglib/qmt/infrastructure/contextmenuaction.cpp diff --git a/src/libs/3rdparty/modeling/qmt/infrastructure/contextmenuaction.h b/src/libs/modelinglib/qmt/infrastructure/contextmenuaction.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/infrastructure/contextmenuaction.h rename to src/libs/modelinglib/qmt/infrastructure/contextmenuaction.h diff --git a/src/libs/3rdparty/modeling/qmt/infrastructure/exceptions.cpp b/src/libs/modelinglib/qmt/infrastructure/exceptions.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/infrastructure/exceptions.cpp rename to src/libs/modelinglib/qmt/infrastructure/exceptions.cpp diff --git a/src/libs/3rdparty/modeling/qmt/infrastructure/exceptions.h b/src/libs/modelinglib/qmt/infrastructure/exceptions.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/infrastructure/exceptions.h rename to src/libs/modelinglib/qmt/infrastructure/exceptions.h diff --git a/src/libs/3rdparty/modeling/qmt/infrastructure/geometryutilities.cpp b/src/libs/modelinglib/qmt/infrastructure/geometryutilities.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/infrastructure/geometryutilities.cpp rename to src/libs/modelinglib/qmt/infrastructure/geometryutilities.cpp diff --git a/src/libs/3rdparty/modeling/qmt/infrastructure/geometryutilities.h b/src/libs/modelinglib/qmt/infrastructure/geometryutilities.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/infrastructure/geometryutilities.h rename to src/libs/modelinglib/qmt/infrastructure/geometryutilities.h diff --git a/src/libs/3rdparty/modeling/qmt/infrastructure/handle.h b/src/libs/modelinglib/qmt/infrastructure/handle.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/infrastructure/handle.h rename to src/libs/modelinglib/qmt/infrastructure/handle.h diff --git a/src/libs/3rdparty/modeling/qmt/infrastructure/handles.h b/src/libs/modelinglib/qmt/infrastructure/handles.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/infrastructure/handles.h rename to src/libs/modelinglib/qmt/infrastructure/handles.h diff --git a/src/libs/3rdparty/modeling/qmt/infrastructure/ioexceptions.cpp b/src/libs/modelinglib/qmt/infrastructure/ioexceptions.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/infrastructure/ioexceptions.cpp rename to src/libs/modelinglib/qmt/infrastructure/ioexceptions.cpp diff --git a/src/libs/3rdparty/modeling/qmt/infrastructure/ioexceptions.h b/src/libs/modelinglib/qmt/infrastructure/ioexceptions.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/infrastructure/ioexceptions.h rename to src/libs/modelinglib/qmt/infrastructure/ioexceptions.h diff --git a/src/libs/3rdparty/modeling/qmt/infrastructure/qcompressedfile.cpp b/src/libs/modelinglib/qmt/infrastructure/qcompressedfile.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/infrastructure/qcompressedfile.cpp rename to src/libs/modelinglib/qmt/infrastructure/qcompressedfile.cpp diff --git a/src/libs/3rdparty/modeling/qmt/infrastructure/qcompressedfile.h b/src/libs/modelinglib/qmt/infrastructure/qcompressedfile.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/infrastructure/qcompressedfile.h rename to src/libs/modelinglib/qmt/infrastructure/qcompressedfile.h diff --git a/src/libs/3rdparty/modeling/qmt/infrastructure/qmt_global.h b/src/libs/modelinglib/qmt/infrastructure/qmt_global.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/infrastructure/qmt_global.h rename to src/libs/modelinglib/qmt/infrastructure/qmt_global.h diff --git a/src/libs/3rdparty/modeling/qmt/infrastructure/qmtassert.h b/src/libs/modelinglib/qmt/infrastructure/qmtassert.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/infrastructure/qmtassert.h rename to src/libs/modelinglib/qmt/infrastructure/qmtassert.h diff --git a/src/libs/3rdparty/modeling/qmt/infrastructure/uid.h b/src/libs/modelinglib/qmt/infrastructure/uid.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/infrastructure/uid.h rename to src/libs/modelinglib/qmt/infrastructure/uid.h diff --git a/src/libs/3rdparty/modeling/qmt/model/massociation.cpp b/src/libs/modelinglib/qmt/model/massociation.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model/massociation.cpp rename to src/libs/modelinglib/qmt/model/massociation.cpp diff --git a/src/libs/3rdparty/modeling/qmt/model/massociation.h b/src/libs/modelinglib/qmt/model/massociation.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model/massociation.h rename to src/libs/modelinglib/qmt/model/massociation.h diff --git a/src/libs/3rdparty/modeling/qmt/model/mcanvasdiagram.cpp b/src/libs/modelinglib/qmt/model/mcanvasdiagram.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model/mcanvasdiagram.cpp rename to src/libs/modelinglib/qmt/model/mcanvasdiagram.cpp diff --git a/src/libs/3rdparty/modeling/qmt/model/mcanvasdiagram.h b/src/libs/modelinglib/qmt/model/mcanvasdiagram.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model/mcanvasdiagram.h rename to src/libs/modelinglib/qmt/model/mcanvasdiagram.h diff --git a/src/libs/3rdparty/modeling/qmt/model/mclass.cpp b/src/libs/modelinglib/qmt/model/mclass.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model/mclass.cpp rename to src/libs/modelinglib/qmt/model/mclass.cpp diff --git a/src/libs/3rdparty/modeling/qmt/model/mclass.h b/src/libs/modelinglib/qmt/model/mclass.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model/mclass.h rename to src/libs/modelinglib/qmt/model/mclass.h diff --git a/src/libs/3rdparty/modeling/qmt/model/mclassmember.cpp b/src/libs/modelinglib/qmt/model/mclassmember.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model/mclassmember.cpp rename to src/libs/modelinglib/qmt/model/mclassmember.cpp diff --git a/src/libs/3rdparty/modeling/qmt/model/mclassmember.h b/src/libs/modelinglib/qmt/model/mclassmember.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model/mclassmember.h rename to src/libs/modelinglib/qmt/model/mclassmember.h diff --git a/src/libs/3rdparty/modeling/qmt/model/mcomponent.cpp b/src/libs/modelinglib/qmt/model/mcomponent.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model/mcomponent.cpp rename to src/libs/modelinglib/qmt/model/mcomponent.cpp diff --git a/src/libs/3rdparty/modeling/qmt/model/mcomponent.h b/src/libs/modelinglib/qmt/model/mcomponent.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model/mcomponent.h rename to src/libs/modelinglib/qmt/model/mcomponent.h diff --git a/src/libs/3rdparty/modeling/qmt/model/mconstvisitor.h b/src/libs/modelinglib/qmt/model/mconstvisitor.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model/mconstvisitor.h rename to src/libs/modelinglib/qmt/model/mconstvisitor.h diff --git a/src/libs/3rdparty/modeling/qmt/model/mdependency.cpp b/src/libs/modelinglib/qmt/model/mdependency.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model/mdependency.cpp rename to src/libs/modelinglib/qmt/model/mdependency.cpp diff --git a/src/libs/3rdparty/modeling/qmt/model/mdependency.h b/src/libs/modelinglib/qmt/model/mdependency.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model/mdependency.h rename to src/libs/modelinglib/qmt/model/mdependency.h diff --git a/src/libs/3rdparty/modeling/qmt/model/mdiagram.cpp b/src/libs/modelinglib/qmt/model/mdiagram.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model/mdiagram.cpp rename to src/libs/modelinglib/qmt/model/mdiagram.cpp diff --git a/src/libs/3rdparty/modeling/qmt/model/mdiagram.h b/src/libs/modelinglib/qmt/model/mdiagram.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model/mdiagram.h rename to src/libs/modelinglib/qmt/model/mdiagram.h diff --git a/src/libs/3rdparty/modeling/qmt/model/melement.cpp b/src/libs/modelinglib/qmt/model/melement.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model/melement.cpp rename to src/libs/modelinglib/qmt/model/melement.cpp diff --git a/src/libs/3rdparty/modeling/qmt/model/melement.h b/src/libs/modelinglib/qmt/model/melement.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model/melement.h rename to src/libs/modelinglib/qmt/model/melement.h diff --git a/src/libs/3rdparty/modeling/qmt/model/minheritance.cpp b/src/libs/modelinglib/qmt/model/minheritance.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model/minheritance.cpp rename to src/libs/modelinglib/qmt/model/minheritance.cpp diff --git a/src/libs/3rdparty/modeling/qmt/model/minheritance.h b/src/libs/modelinglib/qmt/model/minheritance.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model/minheritance.h rename to src/libs/modelinglib/qmt/model/minheritance.h diff --git a/src/libs/3rdparty/modeling/qmt/model/mitem.cpp b/src/libs/modelinglib/qmt/model/mitem.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model/mitem.cpp rename to src/libs/modelinglib/qmt/model/mitem.cpp diff --git a/src/libs/3rdparty/modeling/qmt/model/mitem.h b/src/libs/modelinglib/qmt/model/mitem.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model/mitem.h rename to src/libs/modelinglib/qmt/model/mitem.h diff --git a/src/libs/3rdparty/modeling/qmt/model/mobject.cpp b/src/libs/modelinglib/qmt/model/mobject.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model/mobject.cpp rename to src/libs/modelinglib/qmt/model/mobject.cpp diff --git a/src/libs/3rdparty/modeling/qmt/model/mobject.h b/src/libs/modelinglib/qmt/model/mobject.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model/mobject.h rename to src/libs/modelinglib/qmt/model/mobject.h diff --git a/src/libs/3rdparty/modeling/qmt/model/mpackage.cpp b/src/libs/modelinglib/qmt/model/mpackage.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model/mpackage.cpp rename to src/libs/modelinglib/qmt/model/mpackage.cpp diff --git a/src/libs/3rdparty/modeling/qmt/model/mpackage.h b/src/libs/modelinglib/qmt/model/mpackage.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model/mpackage.h rename to src/libs/modelinglib/qmt/model/mpackage.h diff --git a/src/libs/3rdparty/modeling/qmt/model/mrelation.cpp b/src/libs/modelinglib/qmt/model/mrelation.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model/mrelation.cpp rename to src/libs/modelinglib/qmt/model/mrelation.cpp diff --git a/src/libs/3rdparty/modeling/qmt/model/mrelation.h b/src/libs/modelinglib/qmt/model/mrelation.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model/mrelation.h rename to src/libs/modelinglib/qmt/model/mrelation.h diff --git a/src/libs/3rdparty/modeling/qmt/model/msourceexpansion.cpp b/src/libs/modelinglib/qmt/model/msourceexpansion.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model/msourceexpansion.cpp rename to src/libs/modelinglib/qmt/model/msourceexpansion.cpp diff --git a/src/libs/3rdparty/modeling/qmt/model/msourceexpansion.h b/src/libs/modelinglib/qmt/model/msourceexpansion.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model/msourceexpansion.h rename to src/libs/modelinglib/qmt/model/msourceexpansion.h diff --git a/src/libs/3rdparty/modeling/qmt/model/mvisitor.h b/src/libs/modelinglib/qmt/model/mvisitor.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model/mvisitor.h rename to src/libs/modelinglib/qmt/model/mvisitor.h diff --git a/src/libs/3rdparty/modeling/qmt/model_controller/mchildrenvisitor.cpp b/src/libs/modelinglib/qmt/model_controller/mchildrenvisitor.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model_controller/mchildrenvisitor.cpp rename to src/libs/modelinglib/qmt/model_controller/mchildrenvisitor.cpp diff --git a/src/libs/3rdparty/modeling/qmt/model_controller/mchildrenvisitor.h b/src/libs/modelinglib/qmt/model_controller/mchildrenvisitor.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model_controller/mchildrenvisitor.h rename to src/libs/modelinglib/qmt/model_controller/mchildrenvisitor.h diff --git a/src/libs/3rdparty/modeling/qmt/model_controller/mclonevisitor.cpp b/src/libs/modelinglib/qmt/model_controller/mclonevisitor.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model_controller/mclonevisitor.cpp rename to src/libs/modelinglib/qmt/model_controller/mclonevisitor.cpp diff --git a/src/libs/3rdparty/modeling/qmt/model_controller/mclonevisitor.h b/src/libs/modelinglib/qmt/model_controller/mclonevisitor.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model_controller/mclonevisitor.h rename to src/libs/modelinglib/qmt/model_controller/mclonevisitor.h diff --git a/src/libs/3rdparty/modeling/qmt/model_controller/mcontainer.h b/src/libs/modelinglib/qmt/model_controller/mcontainer.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model_controller/mcontainer.h rename to src/libs/modelinglib/qmt/model_controller/mcontainer.h diff --git a/src/libs/3rdparty/modeling/qmt/model_controller/mflatassignmentvisitor.cpp b/src/libs/modelinglib/qmt/model_controller/mflatassignmentvisitor.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model_controller/mflatassignmentvisitor.cpp rename to src/libs/modelinglib/qmt/model_controller/mflatassignmentvisitor.cpp diff --git a/src/libs/3rdparty/modeling/qmt/model_controller/mflatassignmentvisitor.h b/src/libs/modelinglib/qmt/model_controller/mflatassignmentvisitor.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model_controller/mflatassignmentvisitor.h rename to src/libs/modelinglib/qmt/model_controller/mflatassignmentvisitor.h diff --git a/src/libs/3rdparty/modeling/qmt/model_controller/modelcontroller.cpp b/src/libs/modelinglib/qmt/model_controller/modelcontroller.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model_controller/modelcontroller.cpp rename to src/libs/modelinglib/qmt/model_controller/modelcontroller.cpp diff --git a/src/libs/3rdparty/modeling/qmt/model_controller/modelcontroller.h b/src/libs/modelinglib/qmt/model_controller/modelcontroller.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model_controller/modelcontroller.h rename to src/libs/modelinglib/qmt/model_controller/modelcontroller.h diff --git a/src/libs/3rdparty/modeling/qmt/model_controller/mreferences.h b/src/libs/modelinglib/qmt/model_controller/mreferences.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model_controller/mreferences.h rename to src/libs/modelinglib/qmt/model_controller/mreferences.h diff --git a/src/libs/3rdparty/modeling/qmt/model_controller/mselection.h b/src/libs/modelinglib/qmt/model_controller/mselection.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model_controller/mselection.h rename to src/libs/modelinglib/qmt/model_controller/mselection.h diff --git a/src/libs/3rdparty/modeling/qmt/model_controller/mvoidvisitor.cpp b/src/libs/modelinglib/qmt/model_controller/mvoidvisitor.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model_controller/mvoidvisitor.cpp rename to src/libs/modelinglib/qmt/model_controller/mvoidvisitor.cpp diff --git a/src/libs/3rdparty/modeling/qmt/model_controller/mvoidvisitor.h b/src/libs/modelinglib/qmt/model_controller/mvoidvisitor.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model_controller/mvoidvisitor.h rename to src/libs/modelinglib/qmt/model_controller/mvoidvisitor.h diff --git a/src/libs/3rdparty/modeling/qmt/model_ui/modeltreeviewinterface.h b/src/libs/modelinglib/qmt/model_ui/modeltreeviewinterface.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model_ui/modeltreeviewinterface.h rename to src/libs/modelinglib/qmt/model_ui/modeltreeviewinterface.h diff --git a/src/libs/3rdparty/modeling/qmt/model_ui/sortedtreemodel.cpp b/src/libs/modelinglib/qmt/model_ui/sortedtreemodel.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model_ui/sortedtreemodel.cpp rename to src/libs/modelinglib/qmt/model_ui/sortedtreemodel.cpp diff --git a/src/libs/3rdparty/modeling/qmt/model_ui/sortedtreemodel.h b/src/libs/modelinglib/qmt/model_ui/sortedtreemodel.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model_ui/sortedtreemodel.h rename to src/libs/modelinglib/qmt/model_ui/sortedtreemodel.h diff --git a/src/libs/3rdparty/modeling/qmt/model_ui/stereotypescontroller.cpp b/src/libs/modelinglib/qmt/model_ui/stereotypescontroller.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model_ui/stereotypescontroller.cpp rename to src/libs/modelinglib/qmt/model_ui/stereotypescontroller.cpp diff --git a/src/libs/3rdparty/modeling/qmt/model_ui/stereotypescontroller.h b/src/libs/modelinglib/qmt/model_ui/stereotypescontroller.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model_ui/stereotypescontroller.h rename to src/libs/modelinglib/qmt/model_ui/stereotypescontroller.h diff --git a/src/libs/3rdparty/modeling/qmt/model_ui/treemodel.cpp b/src/libs/modelinglib/qmt/model_ui/treemodel.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model_ui/treemodel.cpp rename to src/libs/modelinglib/qmt/model_ui/treemodel.cpp diff --git a/src/libs/3rdparty/modeling/qmt/model_ui/treemodel.h b/src/libs/modelinglib/qmt/model_ui/treemodel.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model_ui/treemodel.h rename to src/libs/modelinglib/qmt/model_ui/treemodel.h diff --git a/src/libs/3rdparty/modeling/qmt/model_ui/treemodelmanager.cpp b/src/libs/modelinglib/qmt/model_ui/treemodelmanager.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model_ui/treemodelmanager.cpp rename to src/libs/modelinglib/qmt/model_ui/treemodelmanager.cpp diff --git a/src/libs/3rdparty/modeling/qmt/model_ui/treemodelmanager.h b/src/libs/modelinglib/qmt/model_ui/treemodelmanager.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model_ui/treemodelmanager.h rename to src/libs/modelinglib/qmt/model_ui/treemodelmanager.h diff --git a/src/libs/3rdparty/modeling/qmt/model_widgets_ui/classmembersedit.cpp b/src/libs/modelinglib/qmt/model_widgets_ui/classmembersedit.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model_widgets_ui/classmembersedit.cpp rename to src/libs/modelinglib/qmt/model_widgets_ui/classmembersedit.cpp diff --git a/src/libs/3rdparty/modeling/qmt/model_widgets_ui/classmembersedit.h b/src/libs/modelinglib/qmt/model_widgets_ui/classmembersedit.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model_widgets_ui/classmembersedit.h rename to src/libs/modelinglib/qmt/model_widgets_ui/classmembersedit.h diff --git a/src/libs/3rdparty/modeling/qmt/model_widgets_ui/modeltreeview.cpp b/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model_widgets_ui/modeltreeview.cpp rename to src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.cpp diff --git a/src/libs/3rdparty/modeling/qmt/model_widgets_ui/modeltreeview.h b/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model_widgets_ui/modeltreeview.h rename to src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.h diff --git a/src/libs/3rdparty/modeling/qmt/model_widgets_ui/palettebox.cpp b/src/libs/modelinglib/qmt/model_widgets_ui/palettebox.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model_widgets_ui/palettebox.cpp rename to src/libs/modelinglib/qmt/model_widgets_ui/palettebox.cpp diff --git a/src/libs/3rdparty/modeling/qmt/model_widgets_ui/palettebox.h b/src/libs/modelinglib/qmt/model_widgets_ui/palettebox.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model_widgets_ui/palettebox.h rename to src/libs/modelinglib/qmt/model_widgets_ui/palettebox.h diff --git a/src/libs/3rdparty/modeling/qmt/model_widgets_ui/propertiesview.cpp b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesview.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model_widgets_ui/propertiesview.cpp rename to src/libs/modelinglib/qmt/model_widgets_ui/propertiesview.cpp diff --git a/src/libs/3rdparty/modeling/qmt/model_widgets_ui/propertiesview.h b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesview.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model_widgets_ui/propertiesview.h rename to src/libs/modelinglib/qmt/model_widgets_ui/propertiesview.h diff --git a/src/libs/3rdparty/modeling/qmt/model_widgets_ui/propertiesviewmview.cpp b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model_widgets_ui/propertiesviewmview.cpp rename to src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp diff --git a/src/libs/3rdparty/modeling/qmt/model_widgets_ui/propertiesviewmview.h b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/model_widgets_ui/propertiesviewmview.h rename to src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.h diff --git a/src/libs/3rdparty/modeling/qmt/project/project.cpp b/src/libs/modelinglib/qmt/project/project.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/project/project.cpp rename to src/libs/modelinglib/qmt/project/project.cpp diff --git a/src/libs/3rdparty/modeling/qmt/project/project.h b/src/libs/modelinglib/qmt/project/project.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/project/project.h rename to src/libs/modelinglib/qmt/project/project.h diff --git a/src/libs/3rdparty/modeling/qmt/project_controller/projectcontroller.cpp b/src/libs/modelinglib/qmt/project_controller/projectcontroller.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/project_controller/projectcontroller.cpp rename to src/libs/modelinglib/qmt/project_controller/projectcontroller.cpp diff --git a/src/libs/3rdparty/modeling/qmt/project_controller/projectcontroller.h b/src/libs/modelinglib/qmt/project_controller/projectcontroller.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/project_controller/projectcontroller.h rename to src/libs/modelinglib/qmt/project_controller/projectcontroller.h diff --git a/src/libs/3rdparty/modeling/qmt/qmt.pri b/src/libs/modelinglib/qmt/qmt.pri similarity index 100% rename from src/libs/3rdparty/modeling/qmt/qmt.pri rename to src/libs/modelinglib/qmt/qmt.pri diff --git a/src/libs/3rdparty/modeling/qmt/resources/25x25/align-bottom.png b/src/libs/modelinglib/qmt/resources/25x25/align-bottom.png similarity index 100% rename from src/libs/3rdparty/modeling/qmt/resources/25x25/align-bottom.png rename to src/libs/modelinglib/qmt/resources/25x25/align-bottom.png diff --git a/src/libs/3rdparty/modeling/qmt/resources/25x25/align-horizontal.png b/src/libs/modelinglib/qmt/resources/25x25/align-horizontal.png similarity index 100% rename from src/libs/3rdparty/modeling/qmt/resources/25x25/align-horizontal.png rename to src/libs/modelinglib/qmt/resources/25x25/align-horizontal.png diff --git a/src/libs/3rdparty/modeling/qmt/resources/25x25/align-left.png b/src/libs/modelinglib/qmt/resources/25x25/align-left.png similarity index 100% rename from src/libs/3rdparty/modeling/qmt/resources/25x25/align-left.png rename to src/libs/modelinglib/qmt/resources/25x25/align-left.png diff --git a/src/libs/3rdparty/modeling/qmt/resources/25x25/align-right.png b/src/libs/modelinglib/qmt/resources/25x25/align-right.png similarity index 100% rename from src/libs/3rdparty/modeling/qmt/resources/25x25/align-right.png rename to src/libs/modelinglib/qmt/resources/25x25/align-right.png diff --git a/src/libs/3rdparty/modeling/qmt/resources/25x25/align-top.png b/src/libs/modelinglib/qmt/resources/25x25/align-top.png similarity index 100% rename from src/libs/3rdparty/modeling/qmt/resources/25x25/align-top.png rename to src/libs/modelinglib/qmt/resources/25x25/align-top.png diff --git a/src/libs/3rdparty/modeling/qmt/resources/25x25/align-vertical.png b/src/libs/modelinglib/qmt/resources/25x25/align-vertical.png similarity index 100% rename from src/libs/3rdparty/modeling/qmt/resources/25x25/align-vertical.png rename to src/libs/modelinglib/qmt/resources/25x25/align-vertical.png diff --git a/src/libs/3rdparty/modeling/qmt/resources/25x25/even-horizontal.png b/src/libs/modelinglib/qmt/resources/25x25/even-horizontal.png similarity index 100% rename from src/libs/3rdparty/modeling/qmt/resources/25x25/even-horizontal.png rename to src/libs/modelinglib/qmt/resources/25x25/even-horizontal.png diff --git a/src/libs/3rdparty/modeling/qmt/resources/25x25/even-vertical.png b/src/libs/modelinglib/qmt/resources/25x25/even-vertical.png similarity index 100% rename from src/libs/3rdparty/modeling/qmt/resources/25x25/even-vertical.png rename to src/libs/modelinglib/qmt/resources/25x25/even-vertical.png diff --git a/src/libs/3rdparty/modeling/qmt/resources/25x25/same-height.png b/src/libs/modelinglib/qmt/resources/25x25/same-height.png similarity index 100% rename from src/libs/3rdparty/modeling/qmt/resources/25x25/same-height.png rename to src/libs/modelinglib/qmt/resources/25x25/same-height.png diff --git a/src/libs/3rdparty/modeling/qmt/resources/25x25/same-width.png b/src/libs/modelinglib/qmt/resources/25x25/same-width.png similarity index 100% rename from src/libs/3rdparty/modeling/qmt/resources/25x25/same-width.png rename to src/libs/modelinglib/qmt/resources/25x25/same-width.png diff --git a/src/libs/3rdparty/modeling/qmt/resources/48x48/annotation.png b/src/libs/modelinglib/qmt/resources/48x48/annotation.png similarity index 100% rename from src/libs/3rdparty/modeling/qmt/resources/48x48/annotation.png rename to src/libs/modelinglib/qmt/resources/48x48/annotation.png diff --git a/src/libs/3rdparty/modeling/qmt/resources/48x48/association.png b/src/libs/modelinglib/qmt/resources/48x48/association.png similarity index 100% rename from src/libs/3rdparty/modeling/qmt/resources/48x48/association.png rename to src/libs/modelinglib/qmt/resources/48x48/association.png diff --git a/src/libs/3rdparty/modeling/qmt/resources/48x48/boundary.png b/src/libs/modelinglib/qmt/resources/48x48/boundary.png similarity index 100% rename from src/libs/3rdparty/modeling/qmt/resources/48x48/boundary.png rename to src/libs/modelinglib/qmt/resources/48x48/boundary.png diff --git a/src/libs/3rdparty/modeling/qmt/resources/48x48/canvas-diagram.png b/src/libs/modelinglib/qmt/resources/48x48/canvas-diagram.png similarity index 100% rename from src/libs/3rdparty/modeling/qmt/resources/48x48/canvas-diagram.png rename to src/libs/modelinglib/qmt/resources/48x48/canvas-diagram.png diff --git a/src/libs/3rdparty/modeling/qmt/resources/48x48/class.png b/src/libs/modelinglib/qmt/resources/48x48/class.png similarity index 100% rename from src/libs/3rdparty/modeling/qmt/resources/48x48/class.png rename to src/libs/modelinglib/qmt/resources/48x48/class.png diff --git a/src/libs/3rdparty/modeling/qmt/resources/48x48/component.png b/src/libs/modelinglib/qmt/resources/48x48/component.png similarity index 100% rename from src/libs/3rdparty/modeling/qmt/resources/48x48/component.png rename to src/libs/modelinglib/qmt/resources/48x48/component.png diff --git a/src/libs/3rdparty/modeling/qmt/resources/48x48/dependency.png b/src/libs/modelinglib/qmt/resources/48x48/dependency.png similarity index 100% rename from src/libs/3rdparty/modeling/qmt/resources/48x48/dependency.png rename to src/libs/modelinglib/qmt/resources/48x48/dependency.png diff --git a/src/libs/3rdparty/modeling/qmt/resources/48x48/generic.png b/src/libs/modelinglib/qmt/resources/48x48/generic.png similarity index 100% rename from src/libs/3rdparty/modeling/qmt/resources/48x48/generic.png rename to src/libs/modelinglib/qmt/resources/48x48/generic.png diff --git a/src/libs/3rdparty/modeling/qmt/resources/48x48/inheritance.png b/src/libs/modelinglib/qmt/resources/48x48/inheritance.png similarity index 100% rename from src/libs/3rdparty/modeling/qmt/resources/48x48/inheritance.png rename to src/libs/modelinglib/qmt/resources/48x48/inheritance.png diff --git a/src/libs/3rdparty/modeling/qmt/resources/48x48/item.png b/src/libs/modelinglib/qmt/resources/48x48/item.png similarity index 100% rename from src/libs/3rdparty/modeling/qmt/resources/48x48/item.png rename to src/libs/modelinglib/qmt/resources/48x48/item.png diff --git a/src/libs/3rdparty/modeling/qmt/resources/48x48/package.png b/src/libs/modelinglib/qmt/resources/48x48/package.png similarity index 100% rename from src/libs/3rdparty/modeling/qmt/resources/48x48/package.png rename to src/libs/modelinglib/qmt/resources/48x48/package.png diff --git a/src/libs/3rdparty/modeling/qmt/resources/resources.qrc b/src/libs/modelinglib/qmt/resources/resources.qrc similarity index 100% rename from src/libs/3rdparty/modeling/qmt/resources/resources.qrc rename to src/libs/modelinglib/qmt/resources/resources.qrc diff --git a/src/libs/3rdparty/modeling/qmt/serializer/diagramserializer.cpp b/src/libs/modelinglib/qmt/serializer/diagramserializer.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/serializer/diagramserializer.cpp rename to src/libs/modelinglib/qmt/serializer/diagramserializer.cpp diff --git a/src/libs/3rdparty/modeling/qmt/serializer/diagramserializer.h b/src/libs/modelinglib/qmt/serializer/diagramserializer.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/serializer/diagramserializer.h rename to src/libs/modelinglib/qmt/serializer/diagramserializer.h diff --git a/src/libs/3rdparty/modeling/qmt/serializer/infrastructureserializer.cpp b/src/libs/modelinglib/qmt/serializer/infrastructureserializer.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/serializer/infrastructureserializer.cpp rename to src/libs/modelinglib/qmt/serializer/infrastructureserializer.cpp diff --git a/src/libs/3rdparty/modeling/qmt/serializer/infrastructureserializer.h b/src/libs/modelinglib/qmt/serializer/infrastructureserializer.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/serializer/infrastructureserializer.h rename to src/libs/modelinglib/qmt/serializer/infrastructureserializer.h diff --git a/src/libs/3rdparty/modeling/qmt/serializer/modelserializer.cpp b/src/libs/modelinglib/qmt/serializer/modelserializer.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/serializer/modelserializer.cpp rename to src/libs/modelinglib/qmt/serializer/modelserializer.cpp diff --git a/src/libs/3rdparty/modeling/qmt/serializer/modelserializer.h b/src/libs/modelinglib/qmt/serializer/modelserializer.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/serializer/modelserializer.h rename to src/libs/modelinglib/qmt/serializer/modelserializer.h diff --git a/src/libs/3rdparty/modeling/qmt/serializer/projectserializer.cpp b/src/libs/modelinglib/qmt/serializer/projectserializer.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/serializer/projectserializer.cpp rename to src/libs/modelinglib/qmt/serializer/projectserializer.cpp diff --git a/src/libs/3rdparty/modeling/qmt/serializer/projectserializer.h b/src/libs/modelinglib/qmt/serializer/projectserializer.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/serializer/projectserializer.h rename to src/libs/modelinglib/qmt/serializer/projectserializer.h diff --git a/src/libs/3rdparty/modeling/qmt/stereotype/iconshape.cpp b/src/libs/modelinglib/qmt/stereotype/iconshape.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/stereotype/iconshape.cpp rename to src/libs/modelinglib/qmt/stereotype/iconshape.cpp diff --git a/src/libs/3rdparty/modeling/qmt/stereotype/iconshape.h b/src/libs/modelinglib/qmt/stereotype/iconshape.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/stereotype/iconshape.h rename to src/libs/modelinglib/qmt/stereotype/iconshape.h diff --git a/src/libs/3rdparty/modeling/qmt/stereotype/shape.h b/src/libs/modelinglib/qmt/stereotype/shape.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/stereotype/shape.h rename to src/libs/modelinglib/qmt/stereotype/shape.h diff --git a/src/libs/3rdparty/modeling/qmt/stereotype/shapepaintvisitor.cpp b/src/libs/modelinglib/qmt/stereotype/shapepaintvisitor.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/stereotype/shapepaintvisitor.cpp rename to src/libs/modelinglib/qmt/stereotype/shapepaintvisitor.cpp diff --git a/src/libs/3rdparty/modeling/qmt/stereotype/shapepaintvisitor.h b/src/libs/modelinglib/qmt/stereotype/shapepaintvisitor.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/stereotype/shapepaintvisitor.h rename to src/libs/modelinglib/qmt/stereotype/shapepaintvisitor.h diff --git a/src/libs/3rdparty/modeling/qmt/stereotype/shapes.cpp b/src/libs/modelinglib/qmt/stereotype/shapes.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/stereotype/shapes.cpp rename to src/libs/modelinglib/qmt/stereotype/shapes.cpp diff --git a/src/libs/3rdparty/modeling/qmt/stereotype/shapes.h b/src/libs/modelinglib/qmt/stereotype/shapes.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/stereotype/shapes.h rename to src/libs/modelinglib/qmt/stereotype/shapes.h diff --git a/src/libs/3rdparty/modeling/qmt/stereotype/shapevalue.cpp b/src/libs/modelinglib/qmt/stereotype/shapevalue.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/stereotype/shapevalue.cpp rename to src/libs/modelinglib/qmt/stereotype/shapevalue.cpp diff --git a/src/libs/3rdparty/modeling/qmt/stereotype/shapevalue.h b/src/libs/modelinglib/qmt/stereotype/shapevalue.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/stereotype/shapevalue.h rename to src/libs/modelinglib/qmt/stereotype/shapevalue.h diff --git a/src/libs/3rdparty/modeling/qmt/stereotype/shapevisitor.h b/src/libs/modelinglib/qmt/stereotype/shapevisitor.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/stereotype/shapevisitor.h rename to src/libs/modelinglib/qmt/stereotype/shapevisitor.h diff --git a/src/libs/3rdparty/modeling/qmt/stereotype/stereotypecontroller.cpp b/src/libs/modelinglib/qmt/stereotype/stereotypecontroller.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/stereotype/stereotypecontroller.cpp rename to src/libs/modelinglib/qmt/stereotype/stereotypecontroller.cpp diff --git a/src/libs/3rdparty/modeling/qmt/stereotype/stereotypecontroller.h b/src/libs/modelinglib/qmt/stereotype/stereotypecontroller.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/stereotype/stereotypecontroller.h rename to src/libs/modelinglib/qmt/stereotype/stereotypecontroller.h diff --git a/src/libs/3rdparty/modeling/qmt/stereotype/stereotypeicon.cpp b/src/libs/modelinglib/qmt/stereotype/stereotypeicon.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/stereotype/stereotypeicon.cpp rename to src/libs/modelinglib/qmt/stereotype/stereotypeicon.cpp diff --git a/src/libs/3rdparty/modeling/qmt/stereotype/stereotypeicon.h b/src/libs/modelinglib/qmt/stereotype/stereotypeicon.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/stereotype/stereotypeicon.h rename to src/libs/modelinglib/qmt/stereotype/stereotypeicon.h diff --git a/src/libs/3rdparty/modeling/qmt/stereotype/toolbar.cpp b/src/libs/modelinglib/qmt/stereotype/toolbar.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/stereotype/toolbar.cpp rename to src/libs/modelinglib/qmt/stereotype/toolbar.cpp diff --git a/src/libs/3rdparty/modeling/qmt/stereotype/toolbar.h b/src/libs/modelinglib/qmt/stereotype/toolbar.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/stereotype/toolbar.h rename to src/libs/modelinglib/qmt/stereotype/toolbar.h diff --git a/src/libs/3rdparty/modeling/qmt/style/defaultstyle.cpp b/src/libs/modelinglib/qmt/style/defaultstyle.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/style/defaultstyle.cpp rename to src/libs/modelinglib/qmt/style/defaultstyle.cpp diff --git a/src/libs/3rdparty/modeling/qmt/style/defaultstyle.h b/src/libs/modelinglib/qmt/style/defaultstyle.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/style/defaultstyle.h rename to src/libs/modelinglib/qmt/style/defaultstyle.h diff --git a/src/libs/3rdparty/modeling/qmt/style/defaultstyleengine.cpp b/src/libs/modelinglib/qmt/style/defaultstyleengine.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/style/defaultstyleengine.cpp rename to src/libs/modelinglib/qmt/style/defaultstyleengine.cpp diff --git a/src/libs/3rdparty/modeling/qmt/style/defaultstyleengine.h b/src/libs/modelinglib/qmt/style/defaultstyleengine.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/style/defaultstyleengine.h rename to src/libs/modelinglib/qmt/style/defaultstyleengine.h diff --git a/src/libs/3rdparty/modeling/qmt/style/objectvisuals.cpp b/src/libs/modelinglib/qmt/style/objectvisuals.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/style/objectvisuals.cpp rename to src/libs/modelinglib/qmt/style/objectvisuals.cpp diff --git a/src/libs/3rdparty/modeling/qmt/style/objectvisuals.h b/src/libs/modelinglib/qmt/style/objectvisuals.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/style/objectvisuals.h rename to src/libs/modelinglib/qmt/style/objectvisuals.h diff --git a/src/libs/3rdparty/modeling/qmt/style/relationstarterstyle.cpp b/src/libs/modelinglib/qmt/style/relationstarterstyle.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/style/relationstarterstyle.cpp rename to src/libs/modelinglib/qmt/style/relationstarterstyle.cpp diff --git a/src/libs/3rdparty/modeling/qmt/style/relationstarterstyle.h b/src/libs/modelinglib/qmt/style/relationstarterstyle.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/style/relationstarterstyle.h rename to src/libs/modelinglib/qmt/style/relationstarterstyle.h diff --git a/src/libs/3rdparty/modeling/qmt/style/style.cpp b/src/libs/modelinglib/qmt/style/style.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/style/style.cpp rename to src/libs/modelinglib/qmt/style/style.cpp diff --git a/src/libs/3rdparty/modeling/qmt/style/style.h b/src/libs/modelinglib/qmt/style/style.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/style/style.h rename to src/libs/modelinglib/qmt/style/style.h diff --git a/src/libs/3rdparty/modeling/qmt/style/stylecontroller.cpp b/src/libs/modelinglib/qmt/style/stylecontroller.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/style/stylecontroller.cpp rename to src/libs/modelinglib/qmt/style/stylecontroller.cpp diff --git a/src/libs/3rdparty/modeling/qmt/style/stylecontroller.h b/src/libs/modelinglib/qmt/style/stylecontroller.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/style/stylecontroller.h rename to src/libs/modelinglib/qmt/style/stylecontroller.h diff --git a/src/libs/3rdparty/modeling/qmt/style/styledobject.cpp b/src/libs/modelinglib/qmt/style/styledobject.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/style/styledobject.cpp rename to src/libs/modelinglib/qmt/style/styledobject.cpp diff --git a/src/libs/3rdparty/modeling/qmt/style/styledobject.h b/src/libs/modelinglib/qmt/style/styledobject.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/style/styledobject.h rename to src/libs/modelinglib/qmt/style/styledobject.h diff --git a/src/libs/3rdparty/modeling/qmt/style/styledrelation.cpp b/src/libs/modelinglib/qmt/style/styledrelation.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/style/styledrelation.cpp rename to src/libs/modelinglib/qmt/style/styledrelation.cpp diff --git a/src/libs/3rdparty/modeling/qmt/style/styledrelation.h b/src/libs/modelinglib/qmt/style/styledrelation.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/style/styledrelation.h rename to src/libs/modelinglib/qmt/style/styledrelation.h diff --git a/src/libs/3rdparty/modeling/qmt/style/styleengine.h b/src/libs/modelinglib/qmt/style/styleengine.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/style/styleengine.h rename to src/libs/modelinglib/qmt/style/styleengine.h diff --git a/src/libs/3rdparty/modeling/qmt/tasks/alignonrastervisitor.cpp b/src/libs/modelinglib/qmt/tasks/alignonrastervisitor.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/tasks/alignonrastervisitor.cpp rename to src/libs/modelinglib/qmt/tasks/alignonrastervisitor.cpp diff --git a/src/libs/3rdparty/modeling/qmt/tasks/alignonrastervisitor.h b/src/libs/modelinglib/qmt/tasks/alignonrastervisitor.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/tasks/alignonrastervisitor.h rename to src/libs/modelinglib/qmt/tasks/alignonrastervisitor.h diff --git a/src/libs/3rdparty/modeling/qmt/tasks/diagramscenecontroller.cpp b/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/tasks/diagramscenecontroller.cpp rename to src/libs/modelinglib/qmt/tasks/diagramscenecontroller.cpp diff --git a/src/libs/3rdparty/modeling/qmt/tasks/diagramscenecontroller.h b/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/tasks/diagramscenecontroller.h rename to src/libs/modelinglib/qmt/tasks/diagramscenecontroller.h diff --git a/src/libs/3rdparty/modeling/qmt/tasks/finddiagramvisitor.cpp b/src/libs/modelinglib/qmt/tasks/finddiagramvisitor.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/tasks/finddiagramvisitor.cpp rename to src/libs/modelinglib/qmt/tasks/finddiagramvisitor.cpp diff --git a/src/libs/3rdparty/modeling/qmt/tasks/finddiagramvisitor.h b/src/libs/modelinglib/qmt/tasks/finddiagramvisitor.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/tasks/finddiagramvisitor.h rename to src/libs/modelinglib/qmt/tasks/finddiagramvisitor.h diff --git a/src/libs/3rdparty/modeling/qmt/tasks/findrootdiagramvisitor.cpp b/src/libs/modelinglib/qmt/tasks/findrootdiagramvisitor.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/tasks/findrootdiagramvisitor.cpp rename to src/libs/modelinglib/qmt/tasks/findrootdiagramvisitor.cpp diff --git a/src/libs/3rdparty/modeling/qmt/tasks/findrootdiagramvisitor.h b/src/libs/modelinglib/qmt/tasks/findrootdiagramvisitor.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/tasks/findrootdiagramvisitor.h rename to src/libs/modelinglib/qmt/tasks/findrootdiagramvisitor.h diff --git a/src/libs/3rdparty/modeling/qmt/tasks/ielementtasks.h b/src/libs/modelinglib/qmt/tasks/ielementtasks.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/tasks/ielementtasks.h rename to src/libs/modelinglib/qmt/tasks/ielementtasks.h diff --git a/src/libs/3rdparty/modeling/qmt/tasks/isceneinspector.h b/src/libs/modelinglib/qmt/tasks/isceneinspector.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/tasks/isceneinspector.h rename to src/libs/modelinglib/qmt/tasks/isceneinspector.h diff --git a/src/libs/3rdparty/modeling/qmt/tasks/voidelementtasks.cpp b/src/libs/modelinglib/qmt/tasks/voidelementtasks.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qmt/tasks/voidelementtasks.cpp rename to src/libs/modelinglib/qmt/tasks/voidelementtasks.cpp diff --git a/src/libs/3rdparty/modeling/qmt/tasks/voidelementtasks.h b/src/libs/modelinglib/qmt/tasks/voidelementtasks.h similarity index 100% rename from src/libs/3rdparty/modeling/qmt/tasks/voidelementtasks.h rename to src/libs/modelinglib/qmt/tasks/voidelementtasks.h diff --git a/src/libs/3rdparty/modeling/qstringparser/qstringparser.cpp b/src/libs/modelinglib/qstringparser/qstringparser.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qstringparser/qstringparser.cpp rename to src/libs/modelinglib/qstringparser/qstringparser.cpp diff --git a/src/libs/3rdparty/modeling/qstringparser/qstringparser.h b/src/libs/modelinglib/qstringparser/qstringparser.h similarity index 100% rename from src/libs/3rdparty/modeling/qstringparser/qstringparser.h rename to src/libs/modelinglib/qstringparser/qstringparser.h diff --git a/src/libs/3rdparty/modeling/qstringparser/qstringparser.pri b/src/libs/modelinglib/qstringparser/qstringparser.pri similarity index 100% rename from src/libs/3rdparty/modeling/qstringparser/qstringparser.pri rename to src/libs/modelinglib/qstringparser/qstringparser.pri diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/access.h b/src/libs/modelinglib/qtserialization/inc/qark/access.h similarity index 100% rename from src/libs/3rdparty/modeling/qtserialization/inc/qark/access.h rename to src/libs/modelinglib/qtserialization/inc/qark/access.h diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/archivebasics.h b/src/libs/modelinglib/qtserialization/inc/qark/archivebasics.h similarity index 100% rename from src/libs/3rdparty/modeling/qtserialization/inc/qark/archivebasics.h rename to src/libs/modelinglib/qtserialization/inc/qark/archivebasics.h diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/attribute.h b/src/libs/modelinglib/qtserialization/inc/qark/attribute.h similarity index 100% rename from src/libs/3rdparty/modeling/qtserialization/inc/qark/attribute.h rename to src/libs/modelinglib/qtserialization/inc/qark/attribute.h diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/baseclass.h b/src/libs/modelinglib/qtserialization/inc/qark/baseclass.h similarity index 100% rename from src/libs/3rdparty/modeling/qtserialization/inc/qark/baseclass.h rename to src/libs/modelinglib/qtserialization/inc/qark/baseclass.h diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/flag.h b/src/libs/modelinglib/qtserialization/inc/qark/flag.h similarity index 100% rename from src/libs/3rdparty/modeling/qtserialization/inc/qark/flag.h rename to src/libs/modelinglib/qtserialization/inc/qark/flag.h diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/friend_access.h b/src/libs/modelinglib/qtserialization/inc/qark/friend_access.h similarity index 100% rename from src/libs/3rdparty/modeling/qtserialization/inc/qark/friend_access.h rename to src/libs/modelinglib/qtserialization/inc/qark/friend_access.h diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/impl/loadingrefmap.h b/src/libs/modelinglib/qtserialization/inc/qark/impl/loadingrefmap.h similarity index 100% rename from src/libs/3rdparty/modeling/qtserialization/inc/qark/impl/loadingrefmap.h rename to src/libs/modelinglib/qtserialization/inc/qark/impl/loadingrefmap.h diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/impl/objectid.h b/src/libs/modelinglib/qtserialization/inc/qark/impl/objectid.h similarity index 100% rename from src/libs/3rdparty/modeling/qtserialization/inc/qark/impl/objectid.h rename to src/libs/modelinglib/qtserialization/inc/qark/impl/objectid.h diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/impl/savingrefmap.h b/src/libs/modelinglib/qtserialization/inc/qark/impl/savingrefmap.h similarity index 100% rename from src/libs/3rdparty/modeling/qtserialization/inc/qark/impl/savingrefmap.h rename to src/libs/modelinglib/qtserialization/inc/qark/impl/savingrefmap.h diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/parameters.h b/src/libs/modelinglib/qtserialization/inc/qark/parameters.h similarity index 100% rename from src/libs/3rdparty/modeling/qtserialization/inc/qark/parameters.h rename to src/libs/modelinglib/qtserialization/inc/qark/parameters.h diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/qxmlinarchive.h b/src/libs/modelinglib/qtserialization/inc/qark/qxmlinarchive.h similarity index 100% rename from src/libs/3rdparty/modeling/qtserialization/inc/qark/qxmlinarchive.h rename to src/libs/modelinglib/qtserialization/inc/qark/qxmlinarchive.h diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/qxmloutarchive.h b/src/libs/modelinglib/qtserialization/inc/qark/qxmloutarchive.h similarity index 100% rename from src/libs/3rdparty/modeling/qtserialization/inc/qark/qxmloutarchive.h rename to src/libs/modelinglib/qtserialization/inc/qark/qxmloutarchive.h diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/reference.h b/src/libs/modelinglib/qtserialization/inc/qark/reference.h similarity index 100% rename from src/libs/3rdparty/modeling/qtserialization/inc/qark/reference.h rename to src/libs/modelinglib/qtserialization/inc/qark/reference.h diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/serialize.h b/src/libs/modelinglib/qtserialization/inc/qark/serialize.h similarity index 100% rename from src/libs/3rdparty/modeling/qtserialization/inc/qark/serialize.h rename to src/libs/modelinglib/qtserialization/inc/qark/serialize.h diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/serialize_basic.h b/src/libs/modelinglib/qtserialization/inc/qark/serialize_basic.h similarity index 100% rename from src/libs/3rdparty/modeling/qtserialization/inc/qark/serialize_basic.h rename to src/libs/modelinglib/qtserialization/inc/qark/serialize_basic.h diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/serialize_container.h b/src/libs/modelinglib/qtserialization/inc/qark/serialize_container.h similarity index 100% rename from src/libs/3rdparty/modeling/qtserialization/inc/qark/serialize_container.h rename to src/libs/modelinglib/qtserialization/inc/qark/serialize_container.h diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/serialize_enum.h b/src/libs/modelinglib/qtserialization/inc/qark/serialize_enum.h similarity index 100% rename from src/libs/3rdparty/modeling/qtserialization/inc/qark/serialize_enum.h rename to src/libs/modelinglib/qtserialization/inc/qark/serialize_enum.h diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/serialize_pointer.h b/src/libs/modelinglib/qtserialization/inc/qark/serialize_pointer.h similarity index 100% rename from src/libs/3rdparty/modeling/qtserialization/inc/qark/serialize_pointer.h rename to src/libs/modelinglib/qtserialization/inc/qark/serialize_pointer.h diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/tag.h b/src/libs/modelinglib/qtserialization/inc/qark/tag.h similarity index 100% rename from src/libs/3rdparty/modeling/qtserialization/inc/qark/tag.h rename to src/libs/modelinglib/qtserialization/inc/qark/tag.h diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/typeregistry.h b/src/libs/modelinglib/qtserialization/inc/qark/typeregistry.h similarity index 100% rename from src/libs/3rdparty/modeling/qtserialization/inc/qark/typeregistry.h rename to src/libs/modelinglib/qtserialization/inc/qark/typeregistry.h diff --git a/src/libs/3rdparty/modeling/qtserialization/qtserialization.pri b/src/libs/modelinglib/qtserialization/qtserialization.pri similarity index 100% rename from src/libs/3rdparty/modeling/qtserialization/qtserialization.pri rename to src/libs/modelinglib/qtserialization/qtserialization.pri diff --git a/src/libs/3rdparty/modeling/qtserialization/src/flag.cpp b/src/libs/modelinglib/qtserialization/src/flag.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qtserialization/src/flag.cpp rename to src/libs/modelinglib/qtserialization/src/flag.cpp diff --git a/src/libs/3rdparty/modeling/qtserialization/src/savingrefmap.cpp b/src/libs/modelinglib/qtserialization/src/savingrefmap.cpp similarity index 100% rename from src/libs/3rdparty/modeling/qtserialization/src/savingrefmap.cpp rename to src/libs/modelinglib/qtserialization/src/savingrefmap.cpp