ModelEditor: move 3rd_party/modeling into libs/modelinglib

Only moved the files and adapted .pro and .qbs files
accordingly.

Change-Id: I7c17c2ebf246595c104edf60013bf78379955aa7
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>

src/libs/3rdparty/modeling/modeling.pri

@@ -1,6 +0,0 @@
-
-INCLUDEPATH += $$PWD $$PWD/qtserialization/inc
-
-include(qstringparser/qstringparser.pri)
-include(qtserialization/qtserialization.pri)
-include(qmt/qmt.pri)

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)

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"
         ]
     }
 }

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/modelinglib
-INCLUDEPATH *= $$IDE_SOURCE_TREE/src/libs/3rdparty/modeling/qtserialization/inc
+INCLUDEPATH *= $$IDE_SOURCE_TREE/src/libs/modelinglib/qtserialization/inc