From eb38a1c26f1b03c7c58379fa7630e3e2de21a531 Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <dismine@gmail.com>
Date: Wed, 4 Jan 2023 18:31:50 +0200
Subject: [PATCH] Successful build of main binaries.

---
 qbs/imports/VApp.qbs                          |  30 ++
 qbs/imports/VLib.qbs                          |  23 +
 qbs/modules/buildconfig/buildconfig.qbs       | 170 ++++++
 qbs/modules/vcs2/vcs2.qbs                     | 174 +++++++
 src/app/app.qbs                               |   7 +
 .../puzzlepreferenceslayoutpage.cpp           |   2 +-
 src/app/puzzle/dialogs/vpdialogabout.cpp      |   5 +
 src/app/puzzle/layout/vplayoutsettings.h      |   2 +-
 src/app/puzzle/puzzle.qbs                     | 170 ++++++
 src/app/puzzle/scene/vpgraphicspiece.cpp      |   2 +-
 src/app/puzzle/vpapplication.cpp              |   5 +
 src/app/tape/dialogs/dialogabouttape.cpp      |   5 +
 src/app/tape/mapplication.cpp                 |   5 +
 src/app/tape/tape.qbs                         |  90 ++++
 src/app/tape/tmainwindow.ui                   |  24 +-
 src/app/valentina/core/vapplication.cpp       |   7 +-
 src/app/valentina/core/vapplication.h         |   2 +-
 src/app/valentina/core/vcmdexport.cpp         |   2 +-
 .../core/vtooloptionspropertybrowser.cpp      |   2 +-
 src/app/valentina/dialogs/dialogaboutapp.cpp  |   5 +
 .../dialogs/dialogfinalmeasurements.ui        |   6 +-
 src/app/valentina/dialogs/dialogincrements.ui |   2 +-
 .../valentina/dialogs/dialogknownmaterials.ui |   2 +-
 .../dialogs/dialogpatternproperties.ui        |   2 +-
 src/app/valentina/dialogs/vwidgetgroups.ui    |   2 +-
 src/app/valentina/mainwindow.cpp              |   2 +-
 src/app/valentina/mainwindow.ui               |   6 +-
 src/app/valentina/valentina.qbs               | 169 ++++++
 src/libs/fervor/fervor.qbs                    |  31 ++
 src/libs/ifc/ifc.qbs                          |  95 ++++
 src/libs/ifc/xml/vdomdocument.h               |   2 +-
 src/libs/ifc/xml/vlayoutconverter.cpp         |   2 +-
 src/libs/libs.qbs                             |  18 +
 src/libs/qmuparser/qmuparser.qbs              |  51 ++
 src/libs/vdxf/vdxf.qbs                        |  63 +++
 src/libs/vformat/vformat.qbs                  |  34 ++
 src/libs/vgeometry/vgeometry.qbs              |  70 +++
 src/libs/vlayout/dialogs/watermarkwindow.ui   |   2 +-
 src/libs/vlayout/vabstractpiece.h             |   2 +-
 src/libs/vlayout/vlayout.qbs                  |  98 ++++
 src/libs/vlayout/vlayoutpiece_p.h             |   2 +-
 src/libs/vmisc/dialogs/dialogexporttocsv.h    |   2 +-
 .../vmisc/dialogs/dialogselectlanguage.cpp    |   2 +-
 src/libs/vmisc/dialogs/dialogselectlanguage.h |   2 +-
 src/libs/vmisc/projectversion.cpp             |   7 +-
 src/libs/vmisc/testpath.cpp                   |   2 -
 src/libs/vmisc/vmisc.qbs                      | 151 ++++++
 src/libs/vobj/vobj.qbs                        |  30 ++
 src/libs/vpatterndb/vpatterndb.pri            |   6 +-
 src/libs/vpatterndb/vpatterndb.qbs            | 117 +++++
 .../vpropertyexplorer/vpropertyexplorer.qbs   | 105 ++++
 src/libs/vtest/vtest.qbs                      |  28 +
 .../vtools/dialogs/support/dialogeditlabel.ui |   2 +-
 .../dialogs/support/dialogeditwrongformula.ui |   4 +-
 .../vtools/dialogs/tools/dialogalongline.ui   |   2 +-
 src/libs/vtools/dialogs/tools/dialogarc.ui    |   2 +-
 .../dialogs/tools/dialogarcwithlength.h       |   2 +-
 .../dialogs/tools/dialogarcwithlength.ui      |   2 +-
 .../vtools/dialogs/tools/dialogbisector.ui    |   4 +-
 .../dialogs/tools/dialogcurveintersectaxis.ui |   2 +-
 src/libs/vtools/dialogs/tools/dialogcutarc.ui |   2 +-
 .../vtools/dialogs/tools/dialogcutspline.ui   |   2 +-
 .../dialogs/tools/dialogcutsplinepath.ui      |   2 +-
 .../dialogs/tools/dialogellipticalarc.ui      |   2 +-
 .../vtools/dialogs/tools/dialogendline.ui     |   2 +-
 .../dialogs/tools/dialogflippingbyaxis.ui     |   2 +-
 .../dialogs/tools/dialogflippingbyline.ui     |   2 +-
 src/libs/vtools/dialogs/tools/dialoggroup.ui  |   4 +-
 src/libs/vtools/dialogs/tools/dialogline.cpp  |   2 +-
 .../dialogs/tools/dialoglineintersectaxis.ui  |   2 +-
 src/libs/vtools/dialogs/tools/dialogmove.ui   |   4 +-
 src/libs/vtools/dialogs/tools/dialognormal.ui |   2 +-
 .../tools/dialogpointfromarcandtangent.cpp    |   2 +-
 .../tools/dialogpointfromcircleandtangent.ui  |   2 +-
 .../dialogs/tools/dialogpointofcontact.h      |   1 -
 .../dialogs/tools/dialogpointofcontact.ui     |   2 +-
 .../tools/dialogpointofintersectionarcs.cpp   |   2 +-
 .../tools/dialogpointofintersectioncircles.ui |   2 +-
 .../vtools/dialogs/tools/dialogrotation.ui    |   4 +-
 .../dialogs/tools/dialogshoulderpoint.ui      |   2 +-
 .../vtools/dialogs/tools/dialogspline.cpp     |   2 +-
 src/libs/vtools/dialogs/tools/dialogspline.ui |   2 +-
 .../vtools/dialogs/tools/dialogsplinepath.cpp |   2 +-
 .../vtools/dialogs/tools/dialogsplinepath.ui  |   2 +-
 .../dialogs/tools/piece/dialogpiecepath.cpp   |   2 +-
 .../dialogs/tools/piece/dialogpiecepath.ui    |   5 +-
 .../vtools/dialogs/tools/piece/dialogpin.cpp  |   2 +-
 .../dialogs/tools/piece/dialogplacelabel.cpp  |   2 +-
 .../dialogs/tools/piece/dialogplacelabel.ui   |   2 +-
 .../tools/piece/dialogseamallowance.cpp       |   4 +-
 .../dialogs/tools/piece/tabs/tabgrainline.ui  |   2 +-
 .../dialogs/tools/piece/tabs/tablabels.ui     |   4 +-
 .../dialogs/tools/piece/tabs/tabpassmarks.ui  |   2 +-
 .../dialogs/tools/piece/tabs/tabpaths.ui      |   4 +-
 src/libs/vtools/tools/vtoolseamallowance.cpp  |  16 +-
 src/libs/vtools/undocommands/addpiece.h       |   2 +-
 src/libs/vtools/undocommands/deletepiece.h    |   2 +-
 .../vtools/undocommands/savepieceoptions.h    |   2 +-
 .../visualization/line/vistoolendline.cpp     |   2 +-
 .../vtools/visualization/line/vistoolline.cpp |   2 +-
 .../line/vistoolpointofintersectionarcs.cpp   |   2 +-
 .../vtools/visualization/path/vistoolarc.cpp  |   4 +-
 .../vtools/visualization/path/vistoolarc.h    |   2 +-
 .../visualization/path/vistoolarcwithlength.h |   2 +-
 .../path/vistoolpointofintersectioncurves.cpp |   2 +-
 src/libs/vtools/vtools.qbs                    | 485 ++++++++++++++++++
 src/libs/vwidgets/vwidgets.qbs                |  79 +++
 src/src.qbs                                   |   7 +
 valentina.qbs                                 |  10 +
 109 files changed, 2451 insertions(+), 115 deletions(-)
 create mode 100644 qbs/imports/VApp.qbs
 create mode 100644 qbs/imports/VLib.qbs
 create mode 100644 qbs/modules/buildconfig/buildconfig.qbs
 create mode 100644 qbs/modules/vcs2/vcs2.qbs
 create mode 100644 src/app/app.qbs
 create mode 100644 src/app/puzzle/puzzle.qbs
 create mode 100644 src/app/tape/tape.qbs
 create mode 100644 src/app/valentina/valentina.qbs
 create mode 100644 src/libs/fervor/fervor.qbs
 create mode 100644 src/libs/ifc/ifc.qbs
 create mode 100644 src/libs/libs.qbs
 create mode 100644 src/libs/qmuparser/qmuparser.qbs
 create mode 100644 src/libs/vdxf/vdxf.qbs
 create mode 100644 src/libs/vformat/vformat.qbs
 create mode 100644 src/libs/vgeometry/vgeometry.qbs
 create mode 100644 src/libs/vlayout/vlayout.qbs
 create mode 100644 src/libs/vmisc/vmisc.qbs
 create mode 100644 src/libs/vobj/vobj.qbs
 create mode 100644 src/libs/vpatterndb/vpatterndb.qbs
 create mode 100644 src/libs/vpropertyexplorer/vpropertyexplorer.qbs
 create mode 100644 src/libs/vtest/vtest.qbs
 create mode 100644 src/libs/vtools/vtools.qbs
 create mode 100644 src/libs/vwidgets/vwidgets.qbs
 create mode 100644 src/src.qbs
 create mode 100644 valentina.qbs

diff --git a/qbs/imports/VApp.qbs b/qbs/imports/VApp.qbs
new file mode 100644
index 000000000..2554810da
--- /dev/null
+++ b/qbs/imports/VApp.qbs
@@ -0,0 +1,30 @@
+import qbs.FileInfo
+
+CppApplication {
+    Depends { name: "buildconfig" }
+    Depends { name: "bundle" }
+
+    Properties {
+        condition: qbs.targetOS.contains("macos")
+        cpp.minimumMacosVersion: buildconfig.minimumMacosVersion
+    }
+
+    cpp.rpaths: FileInfo.joinPaths(cpp.rpathOrigin,
+                                  "..",
+                                  qbs.targetOS.contains("macos")
+                                  ? "Frameworks"
+                                  : buildconfig.installLibraryPath)
+    install: true
+    installDir: buildconfig.installAppPath
+    installDebugInformation: true
+
+    Properties {
+        condition: Qt.core.versionMajor >= 5 &&  Qt.core.versionMinor < 12
+        cpp.cxxLanguageVersion: "c++11"
+    }
+    // Since Qt 5.12 available support for C++17
+    Properties {
+        condition: Qt.core.versionMajor >= 5 &&  Qt.core.versionMinor >= 12
+        cpp.cxxLanguageVersion: "c++17"
+    }
+}
diff --git a/qbs/imports/VLib.qbs b/qbs/imports/VLib.qbs
new file mode 100644
index 000000000..fbded323c
--- /dev/null
+++ b/qbs/imports/VLib.qbs
@@ -0,0 +1,23 @@
+import qbs.FileInfo
+
+Library {
+    Depends { name: "buildconfig" }
+    Depends { name: "bundle" }
+    Depends { name: "cpp" }
+
+    type: buildconfig.staticBuild ? "staticlibrary" : "dynamiclibrary"
+
+    bundle.isBundle: buildconfig.frameworksBuild
+    cpp.includePaths: [".."]
+    cpp.sonamePrefix: qbs.targetOS.contains("macos") ? "@rpath" : undefined
+    cpp.rpaths: cpp.rpathOrigin
+
+    install: !buildconfig.staticBuild
+    installDir: buildconfig.installLibraryPath
+    installDebugInformation: !buildconfig.staticBuild
+
+    Properties {
+        condition: qbs.targetOS.contains("macos")
+        cpp.minimumMacosVersion: buildconfig.minimumMacosVersion
+    }
+}
diff --git a/qbs/modules/buildconfig/buildconfig.qbs b/qbs/modules/buildconfig/buildconfig.qbs
new file mode 100644
index 000000000..0124efa3b
--- /dev/null
+++ b/qbs/modules/buildconfig/buildconfig.qbs
@@ -0,0 +1,170 @@
+import qbs.FileInfo
+
+Module {
+    property bool staticBuild: true
+    property bool frameworksBuild: qbs.targetOS.contains("macos") && !staticBuild
+
+    property bool enableAddressSanitizer: false
+    property bool enableUbSanitizer: false
+    property bool enableThreadSanitizer: false
+
+    property string libDirName: "lib"
+
+    property string appTarget
+
+    readonly property string installAppPath: {
+        if (qbs.targetOS.contains("macos"))
+            return "Applications";
+        else if (qbs.targetOS.contains("windows"))
+            return ".";
+        else
+            return "bin";
+    }
+
+    readonly property string installBinaryPath: {
+        if (qbs.targetOS.contains("macos"))
+            return installAppPath + "/" + appTarget + ".app/Contents/MacOS"
+        else
+            return installAppPath
+    }
+
+    readonly property string installLibraryPath: {
+        if (qbs.targetOS.contains("macos"))
+            return installAppPath + "/" + appTarget + ".app/Contents/Frameworks"
+        else if (qbs.targetOS.contains("windows"))
+            return installAppPath
+        else
+            return libDirName + "/" + appTarget
+    }
+
+    readonly property string installPluginPath: {
+        if (qbs.targetOS.contains("macos"))
+            return installAppPath + "/" + appTarget + ".app/Contents/Plugins"
+        else
+            return installLibraryPath + "/plugins"
+    }
+
+    readonly property string installDataPath: {
+        if (qbs.targetOS.contains("macos"))
+            return installAppPath + "/" + appTarget + ".app/Contents/Resources"
+        else
+            return "share/" + appTarget
+    }
+
+    Depends { name: "cpp" }
+    Depends { name: "Qt.core"; versionAtLeast: project.minimumQtVersion }
+    Depends { name: "vcs2"; }
+
+    cpp.defines: {
+        var defines = [
+            // The following define makes your compiler emit warnings if you use
+            // any feature of Qt which has been marked as deprecated (the exact warnings
+            // depend on your compiler). Please consult the documentation of the
+            // deprecated API in order to know how to port your code away from it.
+            "QT_DEPRECATED_WARNINGS",
+
+            // You can make your code fail to compile if it uses deprecated APIs.
+            // In order to do so, uncomment the following line.
+            "QT_DISABLE_DEPRECATED_BEFORE=0x060000", // disables all the APIs deprecated before Qt 6.0.0
+
+            // Since Qt 5.4.0 the source code location is recorded only in debug builds.
+            // We need this information also in release builds. For this need define QT_MESSAGELOGCONTEXT.
+            "QT_MESSAGELOGCONTEXT",
+
+            "QBS_BUILD"
+        ];
+
+        if (qbs.targetOS.contains("unix")) {
+            defines.push('BINDIR="' + FileInfo.joinPaths(qbs.installPrefix, "bin") + '"');
+            const dataDir = FileInfo.joinPaths(qbs.installPrefix, "share");
+            defines.push('DATADIR="' + dataDir + '"');
+            defines.push('PKGDATADIR="' + FileInfo.joinPaths(dataDir, "valentina") + '"');
+        }
+
+        return defines;
+    }
+
+    Properties {
+        condition: Qt.core.versionMajor >= 5 &&  Qt.core.versionMinor < 12
+        cpp.cxxLanguageVersion: "c++11"
+    }
+    // Since Qt 5.12 available support for C++17
+    Properties {
+        condition: Qt.core.versionMajor >= 5 &&  Qt.core.versionMinor >= 12
+        cpp.cxxLanguageVersion: "c++17"
+    }
+
+    readonly property string minimumMacosVersion: {
+        // Check which minimal OSX version supports current Qt version
+        if (Qt.core.versionMajor >= 6) {
+            // For Qt 6.5 https://doc-snapshots.qt.io/qt6-6.5/supported-platforms.html
+            if (Qt.core.versionMinor >= 5) // Qt 6.5
+                return "11.0";
+
+            // See page https://doc.qt.io/qt-6.4/supported-platforms.html
+            return "10.14"; // Qt 6.4 and above
+        }
+
+        if (Qt.core.versionMajor >= 5) {
+            // See page https://doc.qt.io/qt-5.15/supported-platforms.html
+            // For qt 5.14 https://doc.qt.io/archives/qt-5.14/supported-platforms.html
+            if (Qt.core.versionMinor >= 14) // Qt 5.14
+                return "10.13";
+
+            // For Qt 5.13 https://doc.qt.io/archives/qt-5.13/supported-platforms.html
+            // For Qt 5.12 https://doc.qt.io/archives/qt-5.12/supported-platforms.html
+            if (Qt.core.versionMinor >= 12) // Qt 5.12
+                return "10.12";
+
+            // For older versions https://doc.qt.io/archives/qt-5.11/supported-platforms-and-configurations.html
+            if (Qt.core.versionMinor >= 10) // Qt 5.11 and Qt 5.10
+                return "10.11";
+
+            if (Qt.core.versionMinor >= 9) // Qt 5.9
+                return "10.10";
+
+            if (Qt.core.versionMinor >= 8) // Qt 5.8
+                return "10.9";
+
+            if (Qt.core.versionMinor >= 7) // Qt 5.7
+                return "10.8";
+
+            if (Qt.core.versionMinor >= 4) // Qt 5.4
+                return "10.7";
+
+            return "10.6";
+        }
+
+        return undefined;
+    }
+
+    cpp.separateDebugInformation: true
+
+    Properties {
+        condition: qbs.buildVariant === "debug"
+        cpp.warningLevel: "all"
+        cpp.treatWarningsAsErrors: true
+    }
+
+    Properties {
+        condition: qbs.toolchain.contains("gcc")
+        cpp.cxxFlags: {
+            var flags = [];
+            if (enableAddressSanitizer)
+                flags.push("-fno-omit-frame-pointer");
+            return flags;
+        }
+        cpp.driverFlags: {
+            var flags = [];
+            if (enableAddressSanitizer)
+                flags.push("-fsanitize=address");
+            if (enableUbSanitizer)
+                flags.push("-fsanitize=undefined");
+            if (enableThreadSanitizer)
+                flags.push("-fsanitize=thread");
+            return flags;
+        }
+    }
+
+    vcs2.headerFileName: "vcsRepoState.h"
+}
diff --git a/qbs/modules/vcs2/vcs2.qbs b/qbs/modules/vcs2/vcs2.qbs
new file mode 100644
index 000000000..62a594285
--- /dev/null
+++ b/qbs/modules/vcs2/vcs2.qbs
@@ -0,0 +1,174 @@
+import qbs.File
+import qbs.FileInfo
+import qbs.Process
+import qbs.TextFile
+import qbs.Utilities
+
+Module {
+    property string type: typeProbe.type
+    property string repoDir: project.sourceDirectory
+    property string toolFilePath: {
+        if (type === "git")
+            return "git";
+        if (type === "svn")
+            return "svn";
+    }
+
+    property string headerFileName: "vcs-repo-state.h"
+    readonly property string repoState: gitProbe.repoState || subversionProbe.repoState
+    readonly property string repoStateTag: gitProbe.repoStateTag || subversionProbe.repoStateTag
+    readonly property string repoStateDistance: gitProbe.repoStateDistance || subversionProbe.repoStateDistance
+    readonly property string repoStateRevision: gitProbe.repoStateRevision || subversionProbe.repoStateRevision
+
+    // Internal
+    readonly property string includeDir: FileInfo.joinPaths(product.buildDirectory, "vcs-include")
+    readonly property string metaDataBaseDir: typeProbe.metaDataBaseDir
+
+    PropertyOptions {
+        name: "type"
+        allowedValues: ["git", "svn"]
+        description: "the version control system your project is using"
+    }
+
+    Depends { name: "cpp"; condition: headerFileName }
+    Properties {
+        condition: headerFileName
+        cpp.includePaths: [includeDir]
+    }
+
+    Probe {
+        id: typeProbe
+
+        property string tool: toolFilePath
+        property string theRepoDir: repoDir
+
+        property string type
+        property string metaDataBaseDir
+
+        configure: {
+            var detector = new Process();
+            try {
+                detector.setWorkingDirectory(theRepoDir);
+                if (detector.exec(tool || "git", ["rev-parse", "--git-dir"]) === 0) {
+                    found = true;
+                    type = "git";
+                    metaDataBaseDir = detector.readStdOut().trim();
+                    if (!FileInfo.isAbsolutePath(metaDataBaseDir))
+                        metaDataBaseDir = FileInfo.joinPaths(theRepoDir, metaDataBaseDir);
+                    return;
+                }
+                if (detector.exec(tool || "svn",
+                                  ["info", "--show-item", "wc-root", "--no-newline"]) === 0) {
+                    found = true
+                    type = "svn";
+                    metaDataBaseDir = FileInfo.joinPaths(detector.readStdOut(), ".svn");
+                    return;
+                } else if (detector.exec(tool || "svn", ["info"]) === 0) {
+                    if (detector.exec(tool || "svn", ["--version", "--quiet"]) === 0
+                            && Utilities.versionCompare(detector.readStdOut().trim(), "1.9") < 0) {
+                        throw "svn too old, version >= 1.9 required";
+                    }
+                }
+            } finally {
+                detector.close();
+            }
+        }
+    }
+
+    Probe {
+        id: gitProbe
+        condition: type === "git"
+
+        property string tool: toolFilePath
+        property string theRepoDir: repoDir
+        property string filePath: FileInfo.joinPaths(metaDataBaseDir, "logs/HEAD")
+        property var timestamp: File.lastModified(filePath)
+
+        property string repoState
+        property string repoStateTag
+        property string repoStateDistance
+        property string repoStateRevision
+
+        configure: {
+            if (!File.exists(filePath))
+                return; // No commits yet.
+            var proc = new Process();
+            try {
+                proc.setWorkingDirectory(theRepoDir);
+                proc.exec(tool, ["describe", "--always", "HEAD"], true);
+                repoState = proc.readStdOut().trim();
+                if (repoState)
+                    found = true;
+
+                    const tagSections = repoState.split("-");
+                    repoStateTag = tagSections[0];
+                    repoStateDistance = tagSections[1];
+                    repoStateRevision = tagSections[2];
+            } finally {
+                proc.close();
+            }
+        }
+    }
+
+    Probe {
+        id: subversionProbe
+        condition: type === "svn"
+
+        property string tool: toolFilePath
+        property string theRepoDir: repoDir
+        property string filePath: FileInfo.joinPaths(metaDataBaseDir, "wc.db")
+        property var timestamp: File.lastModified(filePath)
+
+        property string repoState
+        property string repoStateTag
+        property string repoStateDistance
+        property string repoStateRevision
+
+        configure: {
+            var proc = new Process();
+            try {
+                proc.setWorkingDirectory(theRepoDir);
+                proc.exec(tool, ["info", "-r", "HEAD", "--show-item", "revision", "--no-newline"],
+                          true);
+                repoState = proc.readStdOut().trim();
+                if (repoState)
+                    found = true;
+            } finally {
+                proc.close();
+            }
+        }
+    }
+
+    Rule {
+        condition: headerFileName
+        multiplex: true
+        Artifact {
+            filePath: FileInfo.joinPaths(product.vcs2.includeDir, product.vcs2.headerFileName)
+            fileTags: ["hpp"]
+        }
+        prepare: {
+            var cmd = new JavaScriptCommand();
+            cmd.description = "generating " + output.fileName;
+            cmd.highlight = "codegen";
+            cmd.repoState = product.vcs2.repoState;
+            cmd.repoStateTag = product.vcs2.repoStateTag;
+            cmd.repoStateDistance = product.vcs2.repoStateDistance;
+            cmd.repoStateRevision = product.vcs2.repoStateRevision;
+            cmd.sourceCode = function() {
+                var f = new TextFile(output.filePath, TextFile.WriteOnly);
+                try {
+                    f.writeLine("#ifndef VCS_REPO_STATE_H");
+                    f.writeLine("#define VCS_REPO_STATE_H");
+                    f.writeLine('#define VCS_REPO_STATE "' + (repoState ? repoState : "none") + '"')
+                    f.writeLine('#define VCS_REPO_STATE_TAG "' + (repoStateTag ? repoStateTag : "none") + '"')
+                    f.writeLine('#define VCS_REPO_STATE_DISTANCE "' + (repoStateDistance ? repoStateDistance : "none") + '"')
+                    f.writeLine('#define VCS_REPO_STATE_REVISION "' + (repoStateRevision ? repoStateRevision : "none") + '"')
+                    f.writeLine("#endif");
+                } finally {
+                    f.close();
+                }
+            };
+            return [cmd];
+        }
+    }
+}
diff --git a/src/app/app.qbs b/src/app/app.qbs
new file mode 100644
index 000000000..e4aa919c3
--- /dev/null
+++ b/src/app/app.qbs
@@ -0,0 +1,7 @@
+Project {
+    references: [
+        "valentina/valentina.qbs",
+        "puzzle/puzzle.qbs",
+        "tape/tape.qbs",
+    ]
+}
diff --git a/src/app/puzzle/dialogs/configpages/puzzlepreferenceslayoutpage.cpp b/src/app/puzzle/dialogs/configpages/puzzlepreferenceslayoutpage.cpp
index 28076e555..45d4ec549 100644
--- a/src/app/puzzle/dialogs/configpages/puzzlepreferenceslayoutpage.cpp
+++ b/src/app/puzzle/dialogs/configpages/puzzlepreferenceslayoutpage.cpp
@@ -27,7 +27,7 @@
  *************************************************************************/
 #include "puzzlepreferenceslayoutpage.h"
 #include "ui_puzzlepreferenceslayoutpage.h"
-#include "vpapplication.h"
+#include "../../vpapplication.h"
 #if QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
 #include "../vmisc/backport/qoverload.h"
 #endif // QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
diff --git a/src/app/puzzle/dialogs/vpdialogabout.cpp b/src/app/puzzle/dialogs/vpdialogabout.cpp
index a1a000da0..ee3c57d89 100644
--- a/src/app/puzzle/dialogs/vpdialogabout.cpp
+++ b/src/app/puzzle/dialogs/vpdialogabout.cpp
@@ -39,6 +39,11 @@
 #include <QUrl>
 #include <QtDebug>
 
+#if !defined(BUILD_REVISION) && defined(QBS_BUILD)
+#include <vcsRepoState.h>
+#define BUILD_REVISION VCS_REPO_STATE_REVISION
+#endif
+
 //---------------------------------------------------------------------------------------------------------------------
 VPDialogAbout::VPDialogAbout(QWidget *parent)
     :QDialog(parent),
diff --git a/src/app/puzzle/layout/vplayoutsettings.h b/src/app/puzzle/layout/vplayoutsettings.h
index 207718d42..60f0d9d45 100644
--- a/src/app/puzzle/layout/vplayoutsettings.h
+++ b/src/app/puzzle/layout/vplayoutsettings.h
@@ -33,7 +33,7 @@
 #include <QString>
 #include <QCoreApplication>
 
-#include "def.h"
+#include "../vmisc/def.h"
 
 class VPLayoutSettings
 {
diff --git a/src/app/puzzle/puzzle.qbs b/src/app/puzzle/puzzle.qbs
new file mode 100644
index 000000000..1d3df245e
--- /dev/null
+++ b/src/app/puzzle/puzzle.qbs
@@ -0,0 +1,170 @@
+VApp {
+    Depends { name: "buildconfig" }
+    Depends { name: "ib"; condition: qbs.targetOS.contains("macos") }
+    Depends { name: "freedesktop" }
+    Depends { name: "Qt"; submodules: ["gui", "widgets", "network", "xml", "svg", "xmlpatterns", "printsupport", "concurrent"] }
+    Depends { name: "VMiscLib" }
+    Depends { name: "VLayoutLib" }
+    Depends { name: "IFCLib" }
+    Depends { name: "VFormatLib" }
+    Depends { name: "VWidgetsLib" }
+    Depends { name: "FervorLib" }
+
+    name: "Puzzle"
+    buildconfig.appTarget: qbs.targetOS.contains("macos") ? "Puzzle" : "puzzle"
+    targetName: buildconfig.appTarget
+
+    files: [
+        "main.cpp",
+        "vpapplication.cpp",
+        "vpcommandline.cpp",
+        "vpcommands.cpp",
+        "vpmainwindow.cpp",
+        "vpsettings.cpp",
+        "vptilefactory.cpp",
+        "vpapplication.h",
+        "vpcommandline.h",
+        "vpcommands.h",
+        "vpmainwindow.h",
+        "vpsettings.h",
+        "vptilefactory.h",
+        "vpmainwindow.ui",
+    ]
+
+    Group {
+        name: "dialogs"
+        prefix: "dialogs/"
+        files: [
+            "configpages/puzzlepreferencesconfigurationpage.cpp",
+            "configpages/puzzlepreferencespathpage.cpp",
+            "configpages/puzzlepreferenceslayoutpage.cpp",
+            "dialogpuzzlepreferences.cpp",
+            "vpdialogabout.cpp",
+            "dialogsavemanuallayout.cpp",
+            "configpages/puzzlepreferencesconfigurationpage.h",
+            "configpages/puzzlepreferencespathpage.h",
+            "configpages/puzzlepreferenceslayoutpage.h",
+            "dialogpuzzlepreferences.h",
+            "vpdialogabout.h",
+            "dialogsavemanuallayout.h",
+            "configpages/puzzlepreferencesconfigurationpage.ui",
+            "configpages/puzzlepreferencespathpage.ui",
+            "configpages/puzzlepreferenceslayoutpage.ui",
+            "dialogpuzzlepreferences.ui",
+            "vpdialogabout.ui",
+            "dialogsavemanuallayout.ui",
+        ]
+    }
+
+    Group {
+        name: "undocommands"
+        prefix: "undocommands/"
+        files: [
+            "vpundoaddsheet.cpp",
+            "vpundocommand.cpp",
+            "vpundomovepieceonsheet.cpp",
+            "vpundooriginmove.cpp",
+            "vpundopiecemove.cpp",
+            "vpundopiecerotate.cpp",
+            "vpundopiecezvaluemove.cpp",
+            "vpundoremovesheet.cpp",
+            "vpundoaddsheet.h",
+            "vpundocommand.h",
+            "vpundomovepieceonsheet.h",
+            "vpundooriginmove.h",
+            "vpundopiecemove.h",
+            "vpundopiecerotate.h",
+            "vpundopiecezvaluemove.h",
+            "vpundoremovesheet.h",
+        ]
+    }
+
+    Group {
+        name: "xml"
+        prefix: "xml/"
+        files: [
+            "vplayoutfilereader.cpp",
+            "vplayoutfilewriter.cpp",
+            "vplayoutliterals.cpp",
+            "vplayoutfilereader.h",
+            "vplayoutfilewriter.h",
+            "vplayoutliterals.h",
+        ]
+    }
+
+    Group {
+        name: "layout"
+        prefix: "layout/"
+        files: [
+            "layoutdef.cpp",
+            "vplayout.cpp",
+            "vplayoutsettings.cpp",
+            "vppiece.cpp",
+            "vpsheet.cpp",
+            "layoutdef.h",
+            "vplayout.h",
+            "vplayoutsettings.h",
+            "vppiece.h",
+            "vpsheet.h",
+        ]
+    }
+
+    Group {
+        name: "carousel"
+        prefix: "carousel/"
+        files: [
+            "vpcarrousel.cpp",
+            "vpcarrouselpiece.cpp",
+            "vpcarrouselpiecelist.cpp",
+            "vpmimedatapiece.cpp",
+            "vpcarrousel.h",
+            "vpcarrouselpiece.h",
+            "vpcarrouselpiecelist.h",
+            "vpmimedatapiece.h",
+            "vpcarrousel.ui",
+        ]
+    }
+
+    Group {
+        name: "scene"
+        prefix: "scene/"
+        files: [
+            "vpgraphicspiece.cpp",
+            "vpgraphicspiececontrols.cpp",
+            "vpgraphicssheet.cpp",
+            "vpgraphicstilegrid.cpp",
+            "vpmaingraphicsview.cpp",
+            "scenedef.h",
+            "vpgraphicspiece.h",
+            "vpgraphicspiececontrols.h",
+            "vpgraphicssheet.h",
+            "vpgraphicstilegrid.h",
+            "vpmaingraphicsview.h",
+        ]
+    }
+
+    Group {
+        name: "Resources"
+        prefix: "share/resources/"
+        files: [
+            "cursor.qrc", // Tools cursor icons
+            "puzzleicon.qrc",
+        ]
+    }
+
+    Group {
+        name: "Precompiled headers"
+        files: {
+            var files = ["stable.h"];
+            if (qbs.targetOS.contains("windows"))
+                files.push("stable.cpp")
+            return files;
+        }
+        fileTags: ["cpp_pch_src"]
+    }
+
+    cpp.includePaths: {
+        console.info(product.sourceDirectory)
+        return product.sourceDirectory
+    }
+}
diff --git a/src/app/puzzle/scene/vpgraphicspiece.cpp b/src/app/puzzle/scene/vpgraphicspiece.cpp
index a78ded1c4..bace17670 100644
--- a/src/app/puzzle/scene/vpgraphicspiece.cpp
+++ b/src/app/puzzle/scene/vpgraphicspiece.cpp
@@ -47,7 +47,7 @@
 #include "../vpapplication.h"
 
 #include "compatibility.h"
-#include "vlayoutpiecepath.h"
+#include "../vlayout/vlayoutpiecepath.h"
 
 #include "../vgeometry/vlayoutplacelabel.h"
 
diff --git a/src/app/puzzle/vpapplication.cpp b/src/app/puzzle/vpapplication.cpp
index bf196d5ba..e6fdb75ae 100644
--- a/src/app/puzzle/vpapplication.cpp
+++ b/src/app/puzzle/vpapplication.cpp
@@ -60,6 +60,11 @@ QT_WARNING_POP
 #include <QFileOpenEvent>
 #include <QPixmapCache>
 
+#if !defined(BUILD_REVISION) && defined(QBS_BUILD)
+#include <vcsRepoState.h>
+#define BUILD_REVISION VCS_REPO_STATE_REVISION
+#endif
+
 //---------------------------------------------------------------------------------------------------------------------
 inline void noisyFailureMsgHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg) // NOLINT(readability-function-cognitive-complexity)
 {
diff --git a/src/app/tape/dialogs/dialogabouttape.cpp b/src/app/tape/dialogs/dialogabouttape.cpp
index f2c64bd9b..d54fc9a07 100644
--- a/src/app/tape/dialogs/dialogabouttape.cpp
+++ b/src/app/tape/dialogs/dialogabouttape.cpp
@@ -39,6 +39,11 @@
 #include <QUrl>
 #include <QtDebug>
 
+#if !defined(BUILD_REVISION) && defined(QBS_BUILD)
+#include <vcsRepoState.h>
+#define BUILD_REVISION VCS_REPO_STATE_REVISION
+#endif
+
 //---------------------------------------------------------------------------------------------------------------------
 DialogAboutTape::DialogAboutTape(QWidget *parent)
     :QDialog(parent),
diff --git a/src/app/tape/mapplication.cpp b/src/app/tape/mapplication.cpp
index d0bcfb0ca..c4769c312 100644
--- a/src/app/tape/mapplication.cpp
+++ b/src/app/tape/mapplication.cpp
@@ -59,6 +59,11 @@
 #include <QThread>
 #include <QGlobalStatic>
 
+#if !defined(BUILD_REVISION) && defined(QBS_BUILD)
+#include <vcsRepoState.h>
+#define BUILD_REVISION VCS_REPO_STATE_REVISION
+#endif
+
 #if defined(APPIMAGE) && defined(Q_OS_LINUX)
 #   include "../vmisc/appimage.h"
 #endif // defined(APPIMAGE) && defined(Q_OS_LINUX)
diff --git a/src/app/tape/tape.qbs b/src/app/tape/tape.qbs
new file mode 100644
index 000000000..fb95b26e7
--- /dev/null
+++ b/src/app/tape/tape.qbs
@@ -0,0 +1,90 @@
+VApp {
+    Depends { name: "buildconfig" }
+    Depends { name: "ib"; condition: qbs.targetOS.contains("macos") }
+    Depends { name: "freedesktop" }
+    Depends { name: "Qt"; submodules: ["gui", "widgets", "network", "xml", "xmlpatterns", "printsupport", "svg", "concurrent"] }
+    Depends { name: "VMiscLib"; }
+    Depends { name: "VPatternDBLib"; }
+    Depends { name: "IFCLib"; }
+    Depends { name: "FervorLib"; }
+    Depends { name: "QMUParserLib"; }
+    Depends { name: "VFormatLib"; }
+    Depends { name: "VWidgetsLib"; }
+    Depends { name: "VToolsLib"; }
+
+    name: "Tape"
+    buildconfig.appTarget: qbs.targetOS.contains("macos") ? "Tape" : "tape"
+    targetName: buildconfig.appTarget
+
+    files: [
+        "main.cpp",
+        "tmainwindow.cpp",
+        "mapplication.cpp",
+        "vlitepattern.cpp",
+        "vtapesettings.cpp",
+        "tmainwindow.h",
+        "mapplication.h",
+        "version.h",
+        "vlitepattern.h",
+        "vtapesettings.h",
+        "tmainwindow.ui",
+    ]
+
+    Group {
+        name: "dialogs"
+        prefix: "dialogs/"
+        files: [
+            "dialogdimensioncustomnames.cpp",
+            "dialogdimensionlabels.cpp",
+            "dialogmeasurementscsvcolumns.cpp",
+            "dialogrestrictdimension.cpp",
+            "dialogabouttape.cpp",
+            "dialognewmeasurements.cpp",
+            "dialogmdatabase.cpp",
+            "dialogtapepreferences.cpp",
+            "configpages/tapepreferencesconfigurationpage.cpp",
+            "configpages/tapepreferencespathpage.cpp",
+            "dialogsetupmultisize.cpp",
+            "dialogdimensioncustomnames.h",
+            "dialogdimensionlabels.h",
+            "dialogmeasurementscsvcolumns.h",
+            "dialogrestrictdimension.h",
+            "dialogabouttape.h",
+            "dialognewmeasurements.h",
+            "dialogmdatabase.h",
+            "dialogtapepreferences.h",
+            "configpages/tapepreferencesconfigurationpage.h",
+            "configpages/tapepreferencespathpage.h",
+            "dialogsetupmultisize.h",
+            "dialogdimensioncustomnames.ui",
+            "dialogdimensionlabels.ui",
+            "dialogmeasurementscsvcolumns.ui",
+            "dialogrestrictdimension.ui",
+            "dialogabouttape.ui",
+            "dialognewmeasurements.ui",
+            "dialogmdatabase.ui",
+            "dialogtapepreferences.ui",
+            "configpages/tapepreferencesconfigurationpage.ui",
+            "configpages/tapepreferencespathpage.ui",
+            "dialogsetupmultisize.ui",
+        ]
+    }
+
+    Group {
+        name: "Resources"
+        files: [
+            "share/resources/tapeicon.qrc",
+        ]
+    }
+
+    Group {
+        name: "Precompiled headers"
+        files: {
+            var files = ["stable.h"];
+            if (qbs.targetOS.contains("windows"))
+                files.push("stable.cpp")
+            return files;
+        }
+        fileTags: ["cpp_pch_src"]
+    }
+}
diff --git a/src/app/tape/tmainwindow.ui b/src/app/tape/tmainwindow.ui
index 51f60f573..02f24edf7 100644
--- a/src/app/tape/tmainwindow.ui
+++ b/src/app/tape/tmainwindow.ui
@@ -14,7 +14,7 @@
    <string notr="true"/>
   </property>
   <property name="windowIcon">
-   <iconset>
+   <iconset resource="share/resources/tapeicon.qrc">
     <normaloff>:/tapeicon/64x64/logo.png</normaloff>:/tapeicon/64x64/logo.png</iconset>
   </property>
   <widget class="QWidget" name="centralWidget">
@@ -51,7 +51,7 @@
       </property>
       <widget class="QWidget" name="tabMeasurements">
        <attribute name="icon">
-        <iconset>
+        <iconset resource="share/resources/tapeicon.qrc">
          <normaloff>:/tapeicon/16x16/measurement.png</normaloff>:/tapeicon/16x16/measurement.png</iconset>
        </attribute>
        <attribute name="title">
@@ -626,7 +626,7 @@
                    <string notr="true">...</string>
                   </property>
                   <property name="icon">
-                   <iconset>
+                   <iconset resource="share/resources/tapeicon.qrc">
                     <normaloff>:/tapeicon/24x24/fx.png</normaloff>:/tapeicon/24x24/fx.png</iconset>
                   </property>
                   <property name="iconSize">
@@ -818,7 +818,7 @@
       </widget>
       <widget class="QWidget" name="tabInformation">
        <attribute name="icon">
-        <iconset>
+        <iconset resource="share/resources/tapeicon.qrc">
          <normaloff>:/tapeicon/16x16/info.png</normaloff>:/tapeicon/16x16/info.png</iconset>
        </attribute>
        <attribute name="title">
@@ -1382,7 +1382,7 @@
     <bool>false</bool>
    </property>
    <property name="icon">
-    <iconset>
+    <iconset resource="share/resources/tapeicon.qrc">
      <normaloff>:/tapeicon/24x24/red_plus.png</normaloff>:/tapeicon/24x24/red_plus.png</iconset>
    </property>
    <property name="text">
@@ -1397,7 +1397,7 @@
     <bool>false</bool>
    </property>
    <property name="icon">
-    <iconset>
+    <iconset resource="share/resources/tapeicon.qrc">
      <normaloff>:/tapeicon/24x24/orange_plus.png</normaloff>:/tapeicon/24x24/orange_plus.png</iconset>
    </property>
    <property name="text">
@@ -1415,7 +1415,7 @@
     <bool>false</bool>
    </property>
    <property name="icon">
-    <iconset>
+    <iconset resource="share/resources/tapeicon.qrc">
      <normaloff>:/tapeicon/24x24/padlock_opened.png</normaloff>:/tapeicon/24x24/padlock_opened.png</iconset>
    </property>
    <property name="text">
@@ -1526,7 +1526,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset>
+    <iconset resource="share/resources/tapeicon.qrc">
      <normaloff>:/tapeicon/24x24/mannequin.png</normaloff>:/tapeicon/24x24/mannequin.png</iconset>
    </property>
    <property name="text">
@@ -1625,7 +1625,7 @@
     <bool>false</bool>
    </property>
    <property name="icon">
-    <iconset>
+    <iconset resource="share/resources/tapeicon.qrc">
      <normaloff>:/tapeicon/24x24/separator.png</normaloff>:/tapeicon/24x24/separator.png</iconset>
    </property>
    <property name="text">
@@ -1649,10 +1649,12 @@
   <customwidget>
    <class>VPlainTextEdit</class>
    <extends>QPlainTextEdit</extends>
-   <header>vplaintextedit.h</header>
+   <header>../vwidgets/vplaintextedit.h</header>
   </customwidget>
  </customwidgets>
- <resources/>
+ <resources>
+  <include location="share/resources/tapeicon.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>actionMeasurementDiagram</sender>
diff --git a/src/app/valentina/core/vapplication.cpp b/src/app/valentina/core/vapplication.cpp
index 4082bf6b9..09773f539 100644
--- a/src/app/valentina/core/vapplication.cpp
+++ b/src/app/valentina/core/vapplication.cpp
@@ -38,7 +38,7 @@
 #include "../mainwindow.h"
 #include "../vmisc/qt_dispatch/qt_dispatch.h"
 #include "../vmisc/vsysexits.h"
-#include "vvalentinasettings.h"
+#include "../vmisc/vvalentinasettings.h"
 
 #include <QtDebug>
 #include <QDir>
@@ -53,6 +53,11 @@
 #include <QIcon>
 #include <Qt>
 
+#if !defined(BUILD_REVISION) && defined(QBS_BUILD)
+#include <vcsRepoState.h>
+#define BUILD_REVISION VCS_REPO_STATE_REVISION
+#endif
+
 #if QT_VERSION < QT_VERSION_CHECK(5, 12, 0)
 #include "../vmisc/backport/qscopeguard.h"
 #else
diff --git a/src/app/valentina/core/vapplication.h b/src/app/valentina/core/vapplication.h
index 1cd673aa2..9bc06abf2 100644
--- a/src/app/valentina/core/vapplication.h
+++ b/src/app/valentina/core/vapplication.h
@@ -32,7 +32,7 @@
 #include "../vmisc/vabstractvalapplication.h"
 #include "../vpatterndb/vtranslatevars.h"
 #include "vcmdexport.h"
-#include "vlockguard.h"
+#include "../vmisc/vlockguard.h"
 
 class VApplication;// use in define
 
diff --git a/src/app/valentina/core/vcmdexport.cpp b/src/app/valentina/core/vcmdexport.cpp
index 696175f22..00285e150 100644
--- a/src/app/valentina/core/vcmdexport.cpp
+++ b/src/app/valentina/core/vcmdexport.cpp
@@ -32,7 +32,7 @@
 #include "../ifc/xml/vdomdocument.h"
 #include "../vmisc/commandoptions.h"
 #include "../vmisc/vsysexits.h"
-#include "vvalentinasettings.h"
+#include "../vmisc/vvalentinasettings.h"
 #include "../vmisc/dialogs/dialogexporttocsv.h"
 #include "../vlayout/vlayoutgenerator.h"
 #include <QDebug>
diff --git a/src/app/valentina/core/vtooloptionspropertybrowser.cpp b/src/app/valentina/core/vtooloptionspropertybrowser.cpp
index fc01c75b7..1c85657b1 100644
--- a/src/app/valentina/core/vtooloptionspropertybrowser.cpp
+++ b/src/app/valentina/core/vtooloptionspropertybrowser.cpp
@@ -33,7 +33,7 @@
 #include "../vwidgets/vcontrolpointspline.h"
 #include "../vwidgets/vsimplepoint.h"
 #include "../vwidgets/vsimplecurve.h"
-#include "def.h"
+#include "../vmisc/def.h"
 #include "vformulaproperty.h"
 #include "../vpatterndb/vformula.h"
 #include "../vgeometry/vcubicbezier.h"
diff --git a/src/app/valentina/dialogs/dialogaboutapp.cpp b/src/app/valentina/dialogs/dialogaboutapp.cpp
index abfdfe254..8554aeb72 100644
--- a/src/app/valentina/dialogs/dialogaboutapp.cpp
+++ b/src/app/valentina/dialogs/dialogaboutapp.cpp
@@ -37,6 +37,11 @@
 #include "../vmisc/vabstractvalapplication.h"
 #include "../vmisc/vvalentinasettings.h"
 
+#if !defined(BUILD_REVISION) && defined(QBS_BUILD)
+#include <vcsRepoState.h>
+#define BUILD_REVISION VCS_REPO_STATE_REVISION
+#endif
+
 //---------------------------------------------------------------------------------------------------------------------
 DialogAboutApp::DialogAboutApp(QWidget *parent) :
     QDialog(parent),
diff --git a/src/app/valentina/dialogs/dialogfinalmeasurements.ui b/src/app/valentina/dialogs/dialogfinalmeasurements.ui
index 90a889ea0..5cba8aa0c 100644
--- a/src/app/valentina/dialogs/dialogfinalmeasurements.ui
+++ b/src/app/valentina/dialogs/dialogfinalmeasurements.ui
@@ -88,7 +88,6 @@
        <property name="font">
         <font>
          <pointsize>14</pointsize>
-         <weight>75</weight>
          <italic>false</italic>
          <bold>true</bold>
         </font>
@@ -121,7 +120,6 @@
        <property name="font">
         <font>
          <pointsize>14</pointsize>
-         <weight>75</weight>
          <bold>true</bold>
         </font>
        </property>
@@ -156,7 +154,6 @@
        <property name="font">
         <font>
          <pointsize>14</pointsize>
-         <weight>75</weight>
          <bold>true</bold>
         </font>
        </property>
@@ -188,7 +185,6 @@
        <property name="font">
         <font>
          <pointsize>14</pointsize>
-         <weight>75</weight>
          <bold>true</bold>
         </font>
        </property>
@@ -639,7 +635,7 @@
   <customwidget>
    <class>VPlainTextEdit</class>
    <extends>QPlainTextEdit</extends>
-   <header location="global">vplaintextedit.h</header>
+   <header>../vwidgets/vplaintextedit.h</header>
   </customwidget>
  </customwidgets>
  <resources>
diff --git a/src/app/valentina/dialogs/dialogincrements.ui b/src/app/valentina/dialogs/dialogincrements.ui
index c7ab349c8..9808bd4ba 100644
--- a/src/app/valentina/dialogs/dialogincrements.ui
+++ b/src/app/valentina/dialogs/dialogincrements.ui
@@ -1608,7 +1608,7 @@
   <customwidget>
    <class>VPlainTextEdit</class>
    <extends>QPlainTextEdit</extends>
-   <header>vplaintextedit.h</header>
+   <header>../vwidgets/vplaintextedit.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/app/valentina/dialogs/dialogknownmaterials.ui b/src/app/valentina/dialogs/dialogknownmaterials.ui
index ec6bf6225..2c48784a3 100644
--- a/src/app/valentina/dialogs/dialogknownmaterials.ui
+++ b/src/app/valentina/dialogs/dialogknownmaterials.ui
@@ -106,7 +106,7 @@
   <customwidget>
    <class>VLineEdit</class>
    <extends>QLineEdit</extends>
-   <header>vlineedit.h</header>
+   <header>../vwidgets/vlineedit.h</header>
   </customwidget>
  </customwidgets>
  <resources>
diff --git a/src/app/valentina/dialogs/dialogpatternproperties.ui b/src/app/valentina/dialogs/dialogpatternproperties.ui
index e282095e7..4b6542d63 100644
--- a/src/app/valentina/dialogs/dialogpatternproperties.ui
+++ b/src/app/valentina/dialogs/dialogpatternproperties.ui
@@ -269,7 +269,7 @@
   <customwidget>
    <class>VPlainTextEdit</class>
    <extends>QPlainTextEdit</extends>
-   <header location="global">vplaintextedit.h</header>
+   <header>../vwidgets/vplaintextedit.h</header>
   </customwidget>
  </customwidgets>
  <resources>
diff --git a/src/app/valentina/dialogs/vwidgetgroups.ui b/src/app/valentina/dialogs/vwidgetgroups.ui
index 3a3ee72f3..c0ae44dca 100644
--- a/src/app/valentina/dialogs/vwidgetgroups.ui
+++ b/src/app/valentina/dialogs/vwidgetgroups.ui
@@ -85,7 +85,7 @@
   <customwidget>
    <class>VCompleterLineEdit</class>
    <extends>QLineEdit</extends>
-   <header>vlineedit.h</header>
+   <header>../vwidgets/vlineedit.h</header>
   </customwidget>
  </customwidgets>
  <resources>
diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp
index 010b3c11a..c69048d45 100644
--- a/src/app/valentina/mainwindow.cpp
+++ b/src/app/valentina/mainwindow.cpp
@@ -41,7 +41,7 @@
 #include "../vmisc/qxtcsvmodel.h"
 #include "../vmisc/vmodifierkey.h"
 #include "../vmisc/vsysexits.h"
-#include "undocommands/renamepp.h"
+#include "../vtools/undocommands/renamepp.h"
 #include "core/vtooloptionspropertybrowser.h"
 #include "../ifc/xml/vpatternconverter.h"
 #include "../vformat/vmeasurements.h"
diff --git a/src/app/valentina/mainwindow.ui b/src/app/valentina/mainwindow.ui
index 6570eccd3..1ed08050e 100644
--- a/src/app/valentina/mainwindow.ui
+++ b/src/app/valentina/mainwindow.ui
@@ -3200,17 +3200,17 @@
   <customwidget>
    <class>VMainGraphicsView</class>
    <extends>QGraphicsView</extends>
-   <header>vmaingraphicsview.h</header>
+   <header>../vwidgets/vmaingraphicsview.h</header>
   </customwidget>
   <customwidget>
    <class>VLineEdit</class>
    <extends>QLineEdit</extends>
-   <header>vlineedit.h</header>
+   <header>../vwidgets/vlineedit.h</header>
   </customwidget>
   <customwidget>
    <class>VPlainTextEdit</class>
    <extends>QPlainTextEdit</extends>
-   <header>vplaintextedit.h</header>
+   <header>../vwidgets/vplaintextedit.h</header>
   </customwidget>
  </customwidgets>
  <resources>
diff --git a/src/app/valentina/valentina.qbs b/src/app/valentina/valentina.qbs
new file mode 100644
index 000000000..21a92aad5
--- /dev/null
+++ b/src/app/valentina/valentina.qbs
@@ -0,0 +1,169 @@
+VApp {
+    Depends { name: "buildconfig" }
+    Depends { name: "ib"; condition: qbs.targetOS.contains("macos") }
+    Depends { name: "freedesktop" }
+    Depends { name: "Qt"; submodules: ["gui", "widgets", "xml", "svg", "printsupport", "xmlpatterns", "concurrent"] }
+    Depends { name: "VPropertyExplorerLib" }
+    Depends { name: "VPatternDBLib"; }
+    Depends { name: "VWidgetsLib"; }
+    Depends { name: "FervorLib"; }
+    Depends { name: "IFCLib"; }
+    Depends { name: "VLayoutLib"; }
+    Depends { name: "VToolsLib"; }
+    Depends { name: "VFormatLib"; }
+
+    Depends {
+        name: "Qt.winextras"
+        condition: qbs.targetOS.contains("windows")
+        versionAtLeast: "5.6"
+        required: false
+    }
+
+    name: "Valentina"
+    buildconfig.appTarget: qbs.targetOS.contains("macos") ? "Valentina" : "valentina"
+    targetName: buildconfig.appTarget
+
+    files: [
+        "main.cpp",
+        "mainwindow.cpp",
+        "mainwindow.h",
+        "mainwindowsnogui.cpp",
+        "mainwindowsnogui.h",
+        "version.h",
+        "mainwindow.ui"
+    ]
+
+    Group {
+        name: "dialogs"
+        prefix: "dialogs/"
+        files: [
+            "dialogaddbackgroundimage.h",
+            "dialogs.h",
+            "dialogincrements.h",
+            "dialoghistory.h",
+            "dialogpatternproperties.h",
+            "dialognewpattern.h",
+            "dialogaboutapp.h",
+            "dialoglayoutsettings.h",
+            "dialoglayoutprogress.h",
+            "dialogsavelayout.h",
+            "vwidgetbackgroundimages.h",
+            "vwidgetgroups.h",
+            "vwidgetdetails.h",
+            "dialogpreferences.h",
+            "configpages/preferencesconfigurationpage.h",
+            "configpages/preferencespatternpage.h",
+            "configpages/preferencespathpage.h",
+            "dialogdatetimeformats.h",
+            "dialogknownmaterials.h",
+            "dialogfinalmeasurements.h",
+
+            "dialogaddbackgroundimage.cpp",
+            "dialogincrements.cpp",
+            "dialoghistory.cpp",
+            "dialogpatternproperties.cpp",
+            "dialognewpattern.cpp",
+            "dialogaboutapp.cpp",
+            "dialoglayoutsettings.cpp",
+            "dialoglayoutprogress.cpp",
+            "dialogsavelayout.cpp",
+            "vwidgetbackgroundimages.cpp",
+            "vwidgetgroups.cpp",
+            "vwidgetdetails.cpp",
+            "dialogpreferences.cpp",
+            "configpages/preferencesconfigurationpage.cpp",
+            "configpages/preferencespatternpage.cpp",
+            "configpages/preferencespathpage.cpp",
+            "dialogdatetimeformats.cpp",
+            "dialogknownmaterials.cpp",
+            "dialogfinalmeasurements.cpp",
+
+            "dialogaddbackgroundimage.ui",
+            "dialogincrements.ui",
+            "dialoghistory.ui",
+            "dialogpatternproperties.ui",
+            "dialognewpattern.ui",
+            "dialogaboutapp.ui",
+            "dialoglayoutsettings.ui",
+            "dialoglayoutprogress.ui",
+            "dialogsavelayout.ui",
+            "vwidgetbackgroundimages.ui",
+            "vwidgetgroups.ui",
+            "vwidgetdetails.ui",
+            "dialogpreferences.ui",
+            "configpages/preferencesconfigurationpage.ui",
+            "configpages/preferencespatternpage.ui",
+            "configpages/preferencespathpage.ui",
+            "dialogdatetimeformats.ui",
+            "dialogknownmaterials.ui",
+            "dialogfinalmeasurements.ui"
+        ]
+    }
+
+    Group {
+        name: "xml"
+        prefix: "xml/"
+        files: [
+            "vpattern.h",
+            "vpattern.cpp"
+        ]
+    }
+
+    Group {
+        name: "core"
+        prefix: "core/"
+        files: [
+            "vapplication.h",
+            "vformulaproperty.h",
+            "vformulapropertyeditor.h",
+            "vtooloptionspropertybrowser.h",
+            "vcmdexport.h",
+
+            "vapplication.cpp",
+            "vformulaproperty.cpp",
+            "vformulapropertyeditor.cpp",
+            "vtooloptionspropertybrowser.cpp",
+            "vcmdexport.cpp"
+        ]
+    }
+
+    Group {
+        name: "Resources"
+        prefix: "share/resources/"
+        files: [
+            "cursor.qrc", // Tools cursor icons
+            "toolicon.qrc",
+        ]
+    }
+
+    Properties {
+        condition: qbs.targetOS.contains("macos")
+        ib.appIconName: "Valentina"
+    }
+
+    Properties {
+        // Breakpoints do not work if debug the app inside of bundle. In debug mode we turn off creating a bundle.
+        // Probably it will breake some dependencies. Version for Mac designed to work inside an app bundle.
+        condition: qbs.targetOS.contains("macos") && qbs.buildVariant == "debug"
+        bundle.isBundle: false
+    }
+
+    Group {
+        name: "valentina.png"
+        condition: qbs.targetOS.contains("linux")
+        files: [ "../../../share/icons/64x64/apps/valentina.png" ]
+        qbs.install: true
+        qbs.installDir: "share/pixmaps"
+    }
+
+    Group {
+        name: "Precompiled headers"
+        files: {
+            var files = ["stable.h"];
+            if (qbs.targetOS.contains("windows"))
+                files.push("stable.cpp")
+            return files;
+        }
+        fileTags: ["cpp_pch_src"]
+    }
+}
diff --git a/src/libs/fervor/fervor.qbs b/src/libs/fervor/fervor.qbs
new file mode 100644
index 000000000..295550022
--- /dev/null
+++ b/src/libs/fervor/fervor.qbs
@@ -0,0 +1,31 @@
+VLib {
+    Depends { name: "Qt"; submodules: ["widgets", "network", "printsupport", "xml"] }
+    Depends { name: "VMiscLib" }
+
+    name: "FervorLib"
+    files: [
+        "fvupdatewindow.cpp",
+        "fvupdater.cpp",
+        "fvavailableupdate.cpp",
+        "fvupdatewindow.h",
+        "fvupdater.h",
+        "fvavailableupdate.h",
+        "fvupdatewindow.ui",
+    ]
+
+    Group {
+        name: "Precompiled headers"
+        files: {
+            var files = ["stable.h"];
+            if (qbs.targetOS.contains("windows"))
+                files.push("stable.cpp")
+            return files;
+        }
+        fileTags: ["cpp_pch_src"]
+    }
+
+    Export {
+        Depends { name: "cpp" }
+        cpp.includePaths: [exportingProduct.sourceDirectory]
+    }
+}
diff --git a/src/libs/ifc/ifc.qbs b/src/libs/ifc/ifc.qbs
new file mode 100644
index 000000000..021d5e2d1
--- /dev/null
+++ b/src/libs/ifc/ifc.qbs
@@ -0,0 +1,95 @@
+VLib {
+    Depends { name: "Qt"; submodules: ["gui", "xml", "printsupport", "svg", "xmlpatterns", "concurrent"] }
+    Depends { name: "VMiscLib" }
+
+    name: "IFCLib"
+    files: [
+        "ifcdef.h",
+        "ifcdef.cpp",
+    ]
+
+    Group {
+        name: "exception"
+        prefix: "exception/"
+        files: [
+            "vexceptionobjecterror.h",
+            "vexceptionemptyparameter.h",
+            "vexceptionconversionerror.h",
+            "vexceptionbadid.h",
+            "vexception.h",
+            "vexceptionterminatedposition.h",
+            "vexceptionwrongid.h",
+            "vexceptionundo.h",
+            "vexceptioninvalidnotch.h",
+            "vexceptioninvalidhistory.h",
+            "vexceptionobjecterror.cpp",
+            "vexceptionemptyparameter.cpp",
+            "vexceptionconversionerror.cpp",
+            "vexceptionbadid.cpp",
+            "vexception.cpp",
+            "vexceptionterminatedposition.cpp",
+            "vexceptionwrongid.cpp",
+            "vexceptionundo.cpp",
+            "vexceptioninvalidnotch.cpp",
+            "vexceptioninvalidhistory.cpp", 
+        ]
+    }
+
+    Group {
+        name: "xml"
+        prefix: "xml/"
+        files: [
+            "utils.h",
+            "vabstractconverter.h",
+            "vbackgroundpatternimage.h",
+            "vdomdocument.h",
+            "vlayoutconverter.h",
+            "vpatternconverter.h",
+            "vpatternimage.h",
+            "vtoolrecord.h",
+            "vabstractpattern.h",
+            "vvstconverter.h",
+            "/vvitconverter.h",
+            "/vabstractmconverter.h",
+            "vlabeltemplateconverter.h",
+            "vwatermarkconverter.h",
+            "utils.cpp",
+            "vabstractconverter.cpp",
+            "vbackgroundpatternimage.cpp",
+            "vdomdocument.cpp",
+            "vlayoutconverter.cpp",
+            "vpatternconverter.cpp",
+            "vpatternimage.cpp",
+            "vtoolrecord.cpp",
+            "vabstractpattern.cpp",
+            "vvstconverter.cpp",
+            "vvitconverter.cpp",
+            "vabstractmconverter.cpp",
+            "vlabeltemplateconverter.cpp",
+            "vwatermarkconverter.cpp",
+        ]
+    }
+
+    Group {
+        name: "Precompiled headers"
+        files: {
+            var files = ["stable.h"];
+            if (qbs.targetOS.contains("windows"))
+                files.push("stable.cpp")
+            return files;
+        }
+        fileTags: ["cpp_pch_src"]
+    }
+
+    Group {
+        name: "Resources"
+        files: [
+            "schema.qrc",
+        ]
+    }
+
+    Export {
+        Depends { name: "cpp" }
+        cpp.includePaths: [exportingProduct.sourceDirectory]
+    }
+}
diff --git a/src/libs/ifc/xml/vdomdocument.h b/src/libs/ifc/xml/vdomdocument.h
index 0cc41be30..a8b5a6637 100644
--- a/src/libs/ifc/xml/vdomdocument.h
+++ b/src/libs/ifc/xml/vdomdocument.h
@@ -44,7 +44,7 @@
 #include <QLoggingCategory>
 #include <functional>
 
-#include "../ifc/ifcdef.h"
+#include "../ifcdef.h"
 #include "../vmisc/def.h"
 #if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
diff --git a/src/libs/ifc/xml/vlayoutconverter.cpp b/src/libs/ifc/xml/vlayoutconverter.cpp
index f069e1fdb..c9882a440 100644
--- a/src/libs/ifc/xml/vlayoutconverter.cpp
+++ b/src/libs/ifc/xml/vlayoutconverter.cpp
@@ -27,7 +27,7 @@
  *************************************************************************/
 #include "vlayoutconverter.h"
 #include "../exception/vexception.h"
-#include "ifcdef.h"
+#include "../ifcdef.h"
 #include "../vlayout/vlayoutpoint.h"
 
 /*
diff --git a/src/libs/libs.qbs b/src/libs/libs.qbs
new file mode 100644
index 000000000..c9d277dff
--- /dev/null
+++ b/src/libs/libs.qbs
@@ -0,0 +1,18 @@
+Project {
+    references: [
+        "fervor/fervor.qbs",
+        "ifc/ifc.qbs",
+        "qmuparser/qmuparser.qbs",
+        "vdxf/vdxf.qbs",
+        "vformat/vformat.qbs",
+        "vgeometry/vgeometry.qbs",
+        "vlayout/vlayout.qbs",
+        "vmisc/vmisc.qbs",
+        "vobj/vobj.qbs",
+        "vpatterndb/vpatterndb.qbs",
+        "vpropertyexplorer/vpropertyexplorer.qbs",
+        "vtest/vtest.qbs",
+        "vtools/vtools.qbs",
+        "vwidgets/vwidgets.qbs",
+    ]
+}
diff --git a/src/libs/qmuparser/qmuparser.qbs b/src/libs/qmuparser/qmuparser.qbs
new file mode 100644
index 000000000..3e3d92bea
--- /dev/null
+++ b/src/libs/qmuparser/qmuparser.qbs
@@ -0,0 +1,51 @@
+VLib {
+    name: "QMUParserLib"
+    files: [
+        "qmuparser.cpp",
+        "qmuparsertokenreader.cpp",
+        "qmuparsererror.cpp",
+        "qmuparsercallback.cpp",
+        "qmuparserbytecode.cpp",
+        "qmuparserbase.cpp",
+        "qmuparsertest.cpp",
+        "qmutranslation.cpp",
+        "qmuformulabase.cpp",
+        "qmutokenparser.cpp",
+        "qmudef.cpp",
+        "qmuparser.h",
+        "qmuparser_global.h",
+        "qmuparsertokenreader.h",
+        "qmuparsertoken.h",
+        "qmuparserfixes.h",
+        "qmuparsererror.h",
+        "qmuparserdef.h",
+        "qmuparsercallback.h",
+        "qmuparserbytecode.h",
+        "qmuparserbase.h",
+        "qmuparsertest.h",
+        "qmutranslation.h",
+        "qmudef.h",
+        "qmuformulabase.h",
+        "qmutokenparser.h",
+        "qmuparsercallback_p.h",
+        "make_unique.h",
+    ]
+
+    buildconfig.staticBuild: false
+
+    Group {
+        name: "Precompiled headers"
+        files: {
+            var files = ["stable.h"];
+            if (qbs.targetOS.contains("windows"))
+                files.push("stable.cpp")
+            return files;
+        }
+        fileTags: ["cpp_pch_src"]
+    }
+
+    Export {
+        Depends { name: "cpp" }
+        cpp.includePaths: [exportingProduct.sourceDirectory]
+    }
+}
diff --git a/src/libs/vdxf/vdxf.qbs b/src/libs/vdxf/vdxf.qbs
new file mode 100644
index 000000000..9a4963066
--- /dev/null
+++ b/src/libs/vdxf/vdxf.qbs
@@ -0,0 +1,63 @@
+VLib {
+    Depends { name: "VMiscLib" }
+    Depends { name: "Qt"; submodules: ["gui", "printsupport"] }
+
+    name: "VDXFLib"
+    files: [
+        "vdxfengine.cpp",
+        "vdxfpaintdevice.cpp",
+        "dxiface.cpp",
+        "dxfdef.cpp",
+        "vdxfengine.h",
+        "vdxfpaintdevice.h",
+        "dxfdef.h",
+        "dxiface.h",
+    ]
+
+    Group {
+        name: "libdxfrw"
+        prefix: "libdxfrw/"
+        files: [
+            "drw_base.cpp",
+            "intern/drw_dbg.cpp",
+            "intern/drw_textcodec.cpp",
+            "intern/dxfreader.cpp",
+            "intern/dxfwriter.cpp",
+            "drw_classes.cpp",
+            "drw_entities.cpp",
+            "drw_header.cpp",
+            "drw_objects.cpp",
+            "libdxfrw.cpp",
+            "drw_reserve.h",
+            "intern/make_unique.h",
+            "intern/drw_dbg.h",
+            "intern/drw_textcodec.h",
+            "intern/dxfreader.h",
+            "intern/dxfwriter.h",
+            "drw_base.h",
+            "drw_classes.h",
+            "drw_entities.h",
+            "drw_header.h",
+            "drw_interface.h",
+            "drw_objects.h",
+            "libdxfrw.h",
+            "main_doc.h",
+        ]
+    }
+
+    Group {
+        name: "Precompiled headers"
+        files: {
+            var files = ["stable.h"];
+            if (qbs.targetOS.contains("windows"))
+                files.push("stable.cpp")
+            return files;
+        }
+        fileTags: ["cpp_pch_src"]
+    }
+
+    Export {
+        Depends { name: "cpp" }
+        cpp.includePaths: [exportingProduct.sourceDirectory]
+    }
+}
diff --git a/src/libs/vformat/vformat.qbs b/src/libs/vformat/vformat.qbs
new file mode 100644
index 000000000..6ce6f2e60
--- /dev/null
+++ b/src/libs/vformat/vformat.qbs
@@ -0,0 +1,34 @@
+VLib {
+    Depends { name: "Qt"; submodules: ["xml", "printsupport"] }
+    Depends { name: "VMiscLib" }
+
+    name: "VFormatLib"
+    files: [
+        "vdimensions.cpp",
+        "vmeasurements.cpp",
+        "vlabeltemplate.cpp",
+        "vpatternrecipe.cpp",
+        "vwatermark.cpp",
+        "vdimensions.h",
+        "vmeasurements.h",
+        "vlabeltemplate.h",
+        "vpatternrecipe.h",
+        "vwatermark.h",
+    ]
+
+    Group {
+        name: "Precompiled headers"
+        files: {
+            var files = ["stable.h"];
+            if (qbs.targetOS.contains("windows"))
+                files.push("stable.cpp")
+            return files;
+        }
+        fileTags: ["cpp_pch_src"]
+    }
+
+    Export {
+        Depends { name: "cpp" }
+        cpp.includePaths: [exportingProduct.sourceDirectory]
+    }
+}
diff --git a/src/libs/vgeometry/vgeometry.qbs b/src/libs/vgeometry/vgeometry.qbs
new file mode 100644
index 000000000..2043be043
--- /dev/null
+++ b/src/libs/vgeometry/vgeometry.qbs
@@ -0,0 +1,70 @@
+VLib {
+    Depends { name: "Qt"; submodules: ["gui", "printsupport", "concurrent"] }
+    Depends { name: "VMiscLib"}
+
+    name: "VGeometryLib"
+    files: [
+        "vgeometrydef.cpp",
+        "vgobject.cpp",
+        "vabstractcurve.cpp",
+        "varc.cpp",
+        "vlayoutplacelabel.cpp",
+        "vpointf.cpp",
+        "vspline.cpp",
+        "vsplinepath.cpp",
+        "vsplinepoint.cpp",
+        "vellipticalarc.cpp",
+        "vcubicbezier.cpp",
+        "vabstractcubicbezier.cpp",
+        "vabstractcubicbezierpath.cpp",
+        "vcubicbezierpath.cpp",
+        "vabstractarc.cpp",
+        "vabstractbezier.cpp",
+        "vplacelabelitem.cpp",
+        "vgobject.h",
+        "vgobject_p.h",
+        "vabstractcurve.h",
+        "varc.h",
+        "varc_p.h",
+        "vlayoutplacelabel.h",
+        "vpointf.h",
+        "vpointf_p.h",
+        "vspline.h",
+        "vspline_p.h",
+        "vsplinepath.h",
+        "vsplinepath_p.h",
+        "vsplinepoint.h",
+        "vsplinepoint_p.h",
+        "vgeometrydef.h",
+        "vellipticalarc.h",
+        "vellipticalarc_p.h",
+        "vabstractcurve_p.h",
+        "vcubicbezier.h",
+        "vcubicbezier_p.h",
+        "vabstractcubicbezier.h",
+        "vabstractcubicbezierpath.h",
+        "vcubicbezierpath.h",
+        "vcubicbezierpath_p.h",
+        "vabstractarc.h",
+        "vabstractarc_p.h",
+        "vabstractbezier.h",
+        "vplacelabelitem.h",
+        "vplacelabelitem_p.h"
+    ]
+
+    Group {
+        name: "Precompiled headers"
+        files: {
+            var files = ["stable.h"];
+            if (qbs.targetOS.contains("windows"))
+                files.push("stable.cpp")
+            return files;
+        }
+        fileTags: ["cpp_pch_src"]
+    }
+
+    Export {
+        Depends { name: "cpp" }
+        cpp.includePaths: [exportingProduct.sourceDirectory]
+    }
+}
diff --git a/src/libs/vlayout/dialogs/watermarkwindow.ui b/src/libs/vlayout/dialogs/watermarkwindow.ui
index c3d979f99..191077f8b 100644
--- a/src/libs/vlayout/dialogs/watermarkwindow.ui
+++ b/src/libs/vlayout/dialogs/watermarkwindow.ui
@@ -389,7 +389,7 @@
   <customwidget>
    <class>QtColorPicker</class>
    <extends>QPushButton</extends>
-   <header>qtcolorpicker.h</header>
+   <header>../vwidgets/qtcolorpicker.h</header>
   </customwidget>
  </customwidgets>
  <resources>
diff --git a/src/libs/vlayout/vabstractpiece.h b/src/libs/vlayout/vabstractpiece.h
index 884547b3b..1254c9981 100644
--- a/src/libs/vlayout/vabstractpiece.h
+++ b/src/libs/vlayout/vabstractpiece.h
@@ -40,7 +40,7 @@
 #include "../vgeometry/vgobject.h"
 #include "vsapoint.h"
 #include "vrawsapoint.h"
-#include "testpath.h"
+#include "../vmisc/testpath.h"
 
 class VAbstractPieceData;
 class QPainterPath;
diff --git a/src/libs/vlayout/vlayout.qbs b/src/libs/vlayout/vlayout.qbs
new file mode 100644
index 000000000..7c40ffa27
--- /dev/null
+++ b/src/libs/vlayout/vlayout.qbs
@@ -0,0 +1,98 @@
+VLib {
+    Depends { name: "Qt"; submodules: ["gui", "widgets", "printsupport", "concurrent", "svg", "xml"] }
+    Depends { name: "VMiscLib" }
+    Depends { name: "VGeometryLib" }
+    Depends { name: "VPatternDBLib" }
+    Depends { name: "VObjLib" }
+    Depends { name: "QMUParserLib" }
+    Depends { name: "VDXFLib" }
+    Depends { name: "IFCLib" }
+    Depends { name: "VWidgetsLib" }
+    Depends { name: "VFormatLib" }
+
+    name: "VLayoutLib"
+    files: [
+        "vlayoutexporter.h",
+        "vlayoutgenerator.h",
+        "vlayoutdef.h",
+        "vlayoutpaper.h",
+        "vlayoutpaper_p.h",
+        "vbank.h",
+        "vcontour.h",
+        "vcontour_p.h",
+        "vbestsquare.h",
+        "vlayoutpoint.h",
+        "vposition.h",
+        "vrawlayout.h", 
+        "vprintlayout.h",
+        "vsapoint.h",
+        "vtextmanager.h",
+        "vposter.h",
+        "vgraphicsfillitem.h",
+        "vabstractpiece.h",
+        "vabstractpiece_p.h",
+        "vlayoutpiece.h",
+        "vlayoutpiece_p.h",
+        "vlayoutpiecepath.h",
+        "vlayoutpiecepath_p.h",
+        "vbestsquare_p.h",
+        "vrawsapoint.h",
+        "vlayoutexporter.cpp",
+        "vlayoutgenerator.cpp",
+        "vlayoutpaper.cpp",
+        "vbank.cpp",
+        "vcontour.cpp",
+        "vbestsquare.cpp",
+        "vlayoutpoint.cpp",
+        "vposition.cpp",
+        "vrawlayout.cpp",
+        "vsapoint.cpp",
+        "vprintlayout.cpp",
+        "vtextmanager.cpp",
+        "vposter.cpp",
+        "vgraphicsfillitem.cpp",
+        "vabstractpiece.cpp",
+        "vlayoutpiece.cpp",
+        "vlayoutpiecepath.cpp",
+        "vrawsapoint.cpp",
+    ]
+
+    Group {
+        name: "dialogs"
+        prefix: "dialogs/"
+        files: [
+            "dialoglayoutscale.h",
+            "vabstractlayoutdialog.h",
+            "watermarkwindow.h",
+            "dialoglayoutscale.cpp",
+            "vabstractlayoutdialog.cpp",
+            "watermarkwindow.cpp",
+            "dialoglayoutscale.ui",
+            "watermarkwindow.ui",
+        ]
+    }
+
+    Group {
+        name: "Precompiled headers"
+        files: {
+            var files = ["stable.h"];
+            if (qbs.targetOS.contains("windows"))
+                files.push("stable.cpp")
+            return files;
+        }
+        fileTags: ["cpp_pch_src"]
+    }
+
+    Group {
+        name: "Resources"
+        prefix: "share/"
+        files: [
+            "icons.qrc",
+        ]
+    }
+
+    Export {
+        Depends { name: "cpp" }
+        cpp.includePaths: [exportingProduct.sourceDirectory]
+    }
+}
diff --git a/src/libs/vlayout/vlayoutpiece_p.h b/src/libs/vlayout/vlayoutpiece_p.h
index c1ad97727..7efe933b5 100644
--- a/src/libs/vlayout/vlayoutpiece_p.h
+++ b/src/libs/vlayout/vlayoutpiece_p.h
@@ -46,7 +46,7 @@
 #include "vtextmanager.h"
 #include "../ifc/exception/vexception.h"
 #include "vlayoutpoint.h"
-#include "vlayoutplacelabel.h"
+#include "../vgeometry/vlayoutplacelabel.h"
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
diff --git a/src/libs/vmisc/dialogs/dialogexporttocsv.h b/src/libs/vmisc/dialogs/dialogexporttocsv.h
index 6954e685d..145da8929 100644
--- a/src/libs/vmisc/dialogs/dialogexporttocsv.h
+++ b/src/libs/vmisc/dialogs/dialogexporttocsv.h
@@ -31,7 +31,7 @@
 
 #include <QDialog>
 
-#include "../vmisc/defglobal.h"
+#include "../defglobal.h"
 
 namespace Ui
 {
diff --git a/src/libs/vmisc/dialogs/dialogselectlanguage.cpp b/src/libs/vmisc/dialogs/dialogselectlanguage.cpp
index 80e8deb36..dea6bd4fd 100644
--- a/src/libs/vmisc/dialogs/dialogselectlanguage.cpp
+++ b/src/libs/vmisc/dialogs/dialogselectlanguage.cpp
@@ -27,7 +27,7 @@
  *************************************************************************/
 #include "dialogselectlanguage.h"
 #include "ui_dialogselectlanguage.h"
-#include "../vmisc/def.h"
+#include "../def.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 DialogSelectLanguage::DialogSelectLanguage(QWidget *parent) :
diff --git a/src/libs/vmisc/dialogs/dialogselectlanguage.h b/src/libs/vmisc/dialogs/dialogselectlanguage.h
index bca913212..e371dda8e 100644
--- a/src/libs/vmisc/dialogs/dialogselectlanguage.h
+++ b/src/libs/vmisc/dialogs/dialogselectlanguage.h
@@ -30,7 +30,7 @@
 
 #include <QDialog>
 
-#include "../vmisc/defglobal.h"
+#include "../defglobal.h"
 
 namespace Ui
 {
diff --git a/src/libs/vmisc/projectversion.cpp b/src/libs/vmisc/projectversion.cpp
index 2c051979b..f0906eaee 100644
--- a/src/libs/vmisc/projectversion.cpp
+++ b/src/libs/vmisc/projectversion.cpp
@@ -40,8 +40,13 @@
 #include <QSysInfo>
 #include <QtGlobal>
 
+#if !defined(LATEST_TAG_DISTANCE) && defined(QBS_BUILD)
+#include <vcsRepoState.h>
+#define LATEST_TAG_DISTANCE VCS_REPO_STATE_DISTANCE
+#endif
+
 extern const QString APP_VERSION_STR(QStringLiteral("%1.%2.%3.%4").arg(MAJOR_VERSION).arg(MINOR_VERSION)
-                                 .arg(DEBUG_VERSION).arg(LATEST_TAG_DISTANCE));
+                                         .arg(DEBUG_VERSION).arg(LATEST_TAG_DISTANCE));
 
 //---------------------------------------------------------------------------------------------------------------------
 QString compilerString()
diff --git a/src/libs/vmisc/testpath.cpp b/src/libs/vmisc/testpath.cpp
index 3a7eb8f78..4d9ef4aca 100644
--- a/src/libs/vmisc/testpath.cpp
+++ b/src/libs/vmisc/testpath.cpp
@@ -34,8 +34,6 @@
 #include <QJsonDocument>
 #include <QPointF>
 
-#include "vsapoint.h"
-
 //---------------------------------------------------------------------------------------------------------------------
 #if !defined(V_NO_ASSERT)
 // Use for writing tests
diff --git a/src/libs/vmisc/vmisc.qbs b/src/libs/vmisc/vmisc.qbs
new file mode 100644
index 000000000..fcf8fd428
--- /dev/null
+++ b/src/libs/vmisc/vmisc.qbs
@@ -0,0 +1,151 @@
+VLib {
+    Depends { name: "Qt"; submodules: ["widgets", "printsupport"] }
+    Depends { name: "qbs"; }
+
+    name: "VMiscLib"
+    files: [
+        "def.cpp",
+        "testpath.cpp",
+        "vabstractvalapplication.cpp",
+        "vabstractapplication.cpp",
+        "projectversion.cpp",
+        "vcommonsettings.cpp",
+        "vvalentinasettings.cpp",
+        "commandoptions.cpp",
+        "qxtcsvmodel.cpp",
+        "vtablesearch.cpp",
+        "literals.cpp",
+        "vmodifierkey.cpp",
+        "compatibility.h",
+        "lambdaconstants.h",
+        "def.h",
+        "testpath.h",
+        "vabstractvalapplication.h",
+        "vmath.h",
+        "vabstractapplication.h",
+        "projectversion.h",
+        "vcommonsettings.h",
+        "vvalentinasettings.h",
+        "debugbreak.h",
+        "vlockguard.h",
+        "vsysexits.h",
+        "commandoptions.h",
+        "qxtcsvmodel.h",
+        "vtablesearch.h",
+        "diagnostic.h",
+        "customevents.h",
+        "defglobal.h",
+        "testvapplication.h",
+        "literals.h",
+        "qt_dispatch/qt_dispatch.h",
+        "vdatastreamenum.h",
+        "vmodifierkey.h",
+        "typedef.h",
+    ]
+
+    Group {
+        name: "AppImage"
+        condition: cpp.defines.contains("APPIMAGE")
+        files: [
+            "binreloc.h",
+            "appimage.h",
+            "binreloc.c",
+            "appimage.cpp"
+        ]
+    }
+
+    Group {
+        name: "dialogs"
+        prefix: "dialogs/"
+        files: [
+            "dialogexporttocsv.cpp",
+            "dialogselectlanguage.cpp",
+            "dialogexporttocsv.h",
+            "dialogselectlanguage.h",
+            "dialogexporttocsv.ui",
+            "dialogselectlanguage.ui"
+        ]
+    }
+
+    Group {
+        name: "bpstd"
+        prefix: "bpstd/"
+        files: [
+            "any.hpp",
+            "chrono.hpp",
+            "complex.hpp",
+            "cstddef.hpp",
+            "detail/config.hpp",
+            "detail/enable_overload.hpp",
+            "detail/invoke.hpp",
+            "detail/move.hpp",
+            "detail/nth_type.hpp",
+            "detail/proxy_iterator.hpp",
+            "detail/variant_base.hpp",
+            "detail/variant_fwds.hpp",
+            "detail/variant_traits.hpp",
+            "detail/variant_union.hpp",
+            "detail/variant_visitors.hpp",
+            "exception.hpp",
+            "functional.hpp",
+            "iterator.hpp",
+            "memory.hpp",
+            "optional.hpp",
+            "span.hpp",
+            "string.hpp",
+            "string_view.hpp",
+            "tuple.hpp",
+            "type_traits.hpp",
+            "utility.hpp",
+            "variant.hpp",
+        ]
+    }
+
+    Group {
+        name: "backport"
+        prefix: "backport/"
+        files: [
+            "qoverload.h",
+            "qscopeguard.h",
+        ]
+    }
+
+    Group {
+        name: "fpm"
+        prefix: "fpm/"
+        files: [
+            "fixed.hpp",
+            "math.hpp",
+        ]
+    }
+
+    Group {
+        name: "Precompiled headers"
+        files: {
+            var files = ["stable.h"];
+            if (qbs.targetOS.contains("windows"))
+                files.push("stable.cpp")
+            return files;
+        }
+        fileTags: ["cpp_pch_src"]
+    }
+
+    Group {
+        name: "Resources"
+        prefix: "share/resources/"
+        files: [
+            "theme.qrc", // Windows theme icons.
+            "icon.qrc", // All other icons except cursors and Windows theme.
+            "flags.qrc",
+            "qdarkstyle/style.qrc"
+        ]
+    }
+
+    Export {
+        Depends { name: "cpp" }
+        cpp.includePaths: {
+            console.info(exportingProduct.sourceDirectory)
+            return exportingProduct.sourceDirectory
+        }
+    }
+}
diff --git a/src/libs/vobj/vobj.qbs b/src/libs/vobj/vobj.qbs
new file mode 100644
index 000000000..72e0a3cf3
--- /dev/null
+++ b/src/libs/vobj/vobj.qbs
@@ -0,0 +1,30 @@
+VLib {
+    Depends { name: "Qt"; submodules: ["gui"] }
+
+    name: "VObjLib"
+    files: [
+        "vobjengine.cpp",
+        "vobjpaintdevice.cpp",
+        "delaunay.cpp",
+        "predicates.cpp",
+        "vobjengine.h",
+        "delaunay.h",
+        "vobjpaintdevice.h",
+    ]
+
+    Group {
+        name: "Precompiled headers"
+        files: {
+            var files = ["stable.h"];
+            if (qbs.targetOS.contains("windows"))
+                files.push("stable.cpp")
+            return files;
+        }
+        fileTags: ["cpp_pch_src"]
+    }
+
+    Export {
+        Depends { name: "cpp" }
+        cpp.includePaths: [exportingProduct.sourceDirectory]
+    }
+}
diff --git a/src/libs/vpatterndb/vpatterndb.pri b/src/libs/vpatterndb/vpatterndb.pri
index 2c4d8391c..cb1234ff3 100644
--- a/src/libs/vpatterndb/vpatterndb.pri
+++ b/src/libs/vpatterndb/vpatterndb.pri
@@ -29,7 +29,8 @@ SOURCES += \
     $$PWD/floatItemData/vabstractfloatitemdata.cpp \
     $$PWD/measurements.cpp \
     $$PWD/pmsystems.cpp \
-    $$PWD/vpassmark.cpp
+    $$PWD/vpassmark.cpp \
+    $$PWD/vtranslatemeasurements.cpp
 
 *msvc*:SOURCES += $$PWD/stable.cpp
 
@@ -81,4 +82,5 @@ HEADERS += \
     $$PWD/measurements.h \
     $$PWD/pmsystems.h \
     $$PWD/vformula_p.h \
-    $$PWD/vpassmark.h
+    $$PWD/vpassmark.h \
+    $$PWD/vtranslatemeasurements.h
diff --git a/src/libs/vpatterndb/vpatterndb.qbs b/src/libs/vpatterndb/vpatterndb.qbs
new file mode 100644
index 000000000..4bb227e9b
--- /dev/null
+++ b/src/libs/vpatterndb/vpatterndb.qbs
@@ -0,0 +1,117 @@
+VLib {
+    Depends { name: "VMiscLib" }
+    Depends { name: "Qt"; submodules: ["printsupport", "xml"] }
+    Depends { name: "IFCLib" }
+    Depends { name: "VGeometryLib" }
+
+    name: "VPatternDBLib"
+    files: [
+        "testpassmark.cpp",
+        "vcontainer.cpp",
+        "calculator.cpp",
+        "vnodedetail.cpp",
+        "vtranslatevars.cpp",
+        "vformula.cpp",
+        "vpiece.cpp",
+        "vpiecenode.cpp",
+        "vpiecepath.cpp",
+        "measurements.cpp",
+        "pmsystems.cpp",
+        "vpassmark.cpp",
+        "testpassmark.h",
+        "vcontainer.h",
+        "calculator.h",
+        "vnodedetail.h",
+        "vnodedetail_p.h",
+        "vtranslatevars.h",
+        "vformula.h",
+        "vpiece.h",
+        "vpiece_p.h",
+        "vpiecenode.h",
+        "vpiecenode_p.h",
+        "vpiecepath.h",
+        "vpiecepath_p.h",
+        "measurements.h",
+        "pmsystems.h",
+        "vformula_p.h",
+        "vpassmark.h",
+        "vtranslatemeasurements.cpp",
+        "vtranslatemeasurements.h"
+    ]
+
+    Group {
+        name: "variables"
+        prefix: "variables/"
+        files: [
+            "vpiecearea.cpp",
+            "varcradius.cpp",
+            "vcurveangle.cpp",
+            "vcurvelength.cpp",
+            "vcurvevariable.cpp",
+            "vincrement.cpp",
+            "vinternalvariable.cpp",
+            "vlineangle.cpp",
+            "vlinelength.cpp",
+            "vmeasurement.cpp",
+            "vvariable.cpp",
+            "vcurveclength.cpp",
+            "vpiecearea.h",
+            "vpiecearea_p.h",
+            "varcradius.h",
+            "varcradius_p.h",
+            "vcurveangle.h",
+            "vcurvelength.h",
+            "vcurvevariable.h",
+            "vcurvevariable_p.h",
+            "vincrement.h",
+            "vincrement_p.h",
+            "vinternalvariable.h",
+            "vinternalvariable_p.h",
+            "vlineangle.h",
+            "vlineangle_p.h",
+            "vlinelength.h",
+            "vlinelength_p.h",
+            "vmeasurement.h",
+            "vmeasurement_p.h",
+            "vvariable.h",
+            "vvariable_p.h",
+            "vcurveclength.h",
+        ]
+    }
+
+    Group {
+        name: "floatItemData"
+        prefix: "floatItemData/"
+        files: [
+            "vpiecelabeldata.cpp",
+            "vpatternlabeldata.cpp",
+            "vgrainlinedata.cpp",
+            "vabstractfloatitemdata.cpp",
+            "vpiecelabeldata.h",
+            "vpatternlabeldata.h",
+            "vgrainlinedata.h",
+            "vabstractfloatitemdata.h",
+            "vabstractfloatitemdata_p.h",
+            "vgrainlinedata_p.h",
+            "floatitemdef.h",
+            "vpatternlabeldata_p.h",
+            "vpiecelabeldata_p.h",
+        ]
+    }
+
+    Group {
+        name: "Precompiled headers"
+        files: {
+            var files = ["stable.h"];
+            if (qbs.targetOS.contains("windows"))
+                files.push("stable.cpp")
+            return files;
+        }
+        fileTags: ["cpp_pch_src"]
+    }
+
+    Export {
+        Depends { name: "cpp" }
+        cpp.includePaths: [exportingProduct.sourceDirectory]
+    }
+}
diff --git a/src/libs/vpropertyexplorer/vpropertyexplorer.qbs b/src/libs/vpropertyexplorer/vpropertyexplorer.qbs
new file mode 100644
index 000000000..09ec1cfeb
--- /dev/null
+++ b/src/libs/vpropertyexplorer/vpropertyexplorer.qbs
@@ -0,0 +1,105 @@
+VLib {
+    Depends { name: "Qt"; submodules: ["widgets"] }
+    Depends { name: "VMiscLib" }
+
+    name: "VPropertyExplorerLib"
+    files: [
+        "vproperty.cpp",
+        "vpropertydelegate.cpp",
+        "vpropertyfactorymanager.cpp",
+        "vpropertyformview.cpp",
+        "vpropertyformwidget.cpp",
+        "vpropertymodel.cpp",
+        "vpropertyset.cpp",
+        "vpropertytreeview.cpp",
+        "vserializedproperty.cpp",
+        "vstandardpropertyfactory.cpp",
+        "checkablemessagebox.cpp",
+        "vpropertyexplorer_global.h",
+        "vpropertyfactorymanager_p.h",
+        "vpropertytreeview_p.h",
+        "vpropertyset_p.h",
+        "vabstractpropertyfactory.h",
+        "vfileproperty_p.h",
+        "vwidgetproperty_p.h",
+        "vpropertymodel_p.h",
+        "vstandardpropertyfactory.h",
+        "vpropertyformview_p.h",
+        "vpropertytreeview.h",
+        "vpropertyformwidget_p.h",
+        "vpropertydelegate.h",
+        "vproperty_p.h",
+        "vpropertyformwidget.h",
+        "vpropertyformview.h",
+        "vpropertyset.h",
+        "vpropertymodel.h",
+        "vproperty.h",
+        "vpropertyfactorymanager.h",
+        "vserializedproperty.h",
+        "vproperties.h",
+        "checkablemessagebox.h",
+    ]
+
+    buildconfig.staticBuild: false
+
+    Group {
+        name: "plugins"
+        prefix: "plugins/"
+        files: [
+            "vtextproperty.cpp",
+            "vwidgetproperty.cpp",
+            "vemptyproperty.cpp",
+            "vboolproperty.cpp",
+            "vshortcutproperty.cpp",
+            "vcolorproperty.cpp",
+            "vshortcutpropertyeditor.cpp",
+            "venumproperty.cpp",
+            "vfileproperty.cpp",
+            "vcolorpropertyeditor.cpp",
+            "vfilepropertyeditor.cpp",
+            "vnumberproperty.cpp",
+            "Vector3d/vvector3dproperty.cpp",
+            "vstringproperty.cpp",
+            "vpointfproperty.cpp",
+            "vobjectproperty.cpp",
+            "vlinetypeproperty.cpp",
+            "vlinecolorproperty.cpp",
+            "vlabelproperty.cpp",
+            "vtextproperty.h",
+            "vwidgetproperty.h",
+            "vcolorproperty.h",
+            "vboolproperty.h",
+            "vcolorpropertyeditor.h",
+            "vshortcutpropertyeditor.h",
+            "vemptyproperty.h",
+            "vshortcutproperty.h",
+            "venumproperty.h",
+            "vfilepropertyeditor.h",
+            "vfileproperty.h",
+            "vnumberproperty.h",
+            "Vector3d/vvector3dproperty.h",
+            "vstringproperty.h",
+            "vpointfproperty.h",
+            "vobjectproperty.h",
+            "vlinetypeproperty.h",
+            "vlinecolorproperty.h",
+            "vlabelproperty.h",
+        ]
+    }
+
+    Group {
+        name: "Precompiled headers"
+        files: {
+            var files = ["stable.h"];
+            if (qbs.targetOS.contains("windows"))
+                files.push("stable.cpp")
+            return files;
+        }
+        fileTags: ["cpp_pch_src"]
+    }
+
+    Export {
+        Depends { name: "cpp" }
+        cpp.includePaths: [exportingProduct.sourceDirectory]
+    }
+}
diff --git a/src/libs/vtest/vtest.qbs b/src/libs/vtest/vtest.qbs
new file mode 100644
index 000000000..6e9a8a68f
--- /dev/null
+++ b/src/libs/vtest/vtest.qbs
@@ -0,0 +1,28 @@
+VLib {
+    Depends { name: "Qt"; submodules: ["testlib", "gui", "printsupport"] }
+    Depends { name: "VGeometryLib" }
+    Depends { name: "VLayoutLib" }
+    Depends { name: "IFCLib" }
+
+    name: "VTestLib"
+    files: [
+        "abstracttest.cpp",
+        "abstracttest.h",
+    ]
+
+    Group {
+        name: "Precompiled headers"
+        files: {
+            var files = ["stable.h"];
+            if (qbs.targetOS.contains("windows"))
+                files.push("stable.cpp")
+            return files;
+        }
+        fileTags: ["cpp_pch_src"]
+    }
+
+    Export {
+        Depends { name: "cpp" }
+        cpp.includePaths: [exportingProduct.sourceDirectory]
+    }
+}
diff --git a/src/libs/vtools/dialogs/support/dialogeditlabel.ui b/src/libs/vtools/dialogs/support/dialogeditlabel.ui
index 5234d9d36..5cfa5dd12 100644
--- a/src/libs/vtools/dialogs/support/dialogeditlabel.ui
+++ b/src/libs/vtools/dialogs/support/dialogeditlabel.ui
@@ -450,7 +450,7 @@
   <customwidget>
    <class>VLineEdit</class>
    <extends>QLineEdit</extends>
-   <header>vlineedit.h</header>
+   <header>../vwidgets/vlineedit.h</header>
   </customwidget>
  </customwidgets>
  <resources>
diff --git a/src/libs/vtools/dialogs/support/dialogeditwrongformula.ui b/src/libs/vtools/dialogs/support/dialogeditwrongformula.ui
index d1c282ddc..6cfa88c9c 100644
--- a/src/libs/vtools/dialogs/support/dialogeditwrongformula.ui
+++ b/src/libs/vtools/dialogs/support/dialogeditwrongformula.ui
@@ -415,12 +415,12 @@
   <customwidget>
    <class>VPlainTextEdit</class>
    <extends>QPlainTextEdit</extends>
-   <header location="global">vplaintextedit.h</header>
+   <header>../vwidgets/vplaintextedit.h</header>
   </customwidget>
   <customwidget>
    <class>VElidedLabel</class>
    <extends>QFrame</extends>
-   <header location="global">velidedlabel.h</header>
+   <header>../vwidgets/velidedlabel.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/libs/vtools/dialogs/tools/dialogalongline.ui b/src/libs/vtools/dialogs/tools/dialogalongline.ui
index 0867dc0b4..5fd9797d6 100644
--- a/src/libs/vtools/dialogs/tools/dialogalongline.ui
+++ b/src/libs/vtools/dialogs/tools/dialogalongline.ui
@@ -385,7 +385,7 @@
   <customwidget>
    <class>VPlainTextEdit</class>
    <extends>QPlainTextEdit</extends>
-   <header location="global">vplaintextedit.h</header>
+   <header>../vwidgets/vplaintextedit.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/libs/vtools/dialogs/tools/dialogarc.ui b/src/libs/vtools/dialogs/tools/dialogarc.ui
index bea483bc3..0314113ac 100644
--- a/src/libs/vtools/dialogs/tools/dialogarc.ui
+++ b/src/libs/vtools/dialogs/tools/dialogarc.ui
@@ -721,7 +721,7 @@
   <customwidget>
    <class>VPlainTextEdit</class>
    <extends>QPlainTextEdit</extends>
-   <header location="global">vplaintextedit.h</header>
+   <header>../vwidgets/vplaintextedit.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/libs/vtools/dialogs/tools/dialogarcwithlength.h b/src/libs/vtools/dialogs/tools/dialogarcwithlength.h
index 3b691b87a..7d70c8c62 100644
--- a/src/libs/vtools/dialogs/tools/dialogarcwithlength.h
+++ b/src/libs/vtools/dialogs/tools/dialogarcwithlength.h
@@ -36,7 +36,7 @@
 #include <QtGlobal>
 
 #include "../vmisc/def.h"
-#include "defglobal.h"
+#include "../vmisc/defglobal.h"
 #include "dialogtool.h"
 
 namespace Ui
diff --git a/src/libs/vtools/dialogs/tools/dialogarcwithlength.ui b/src/libs/vtools/dialogs/tools/dialogarcwithlength.ui
index 2639a01e7..b6790d8c6 100644
--- a/src/libs/vtools/dialogs/tools/dialogarcwithlength.ui
+++ b/src/libs/vtools/dialogs/tools/dialogarcwithlength.ui
@@ -710,7 +710,7 @@
   <customwidget>
    <class>VPlainTextEdit</class>
    <extends>QPlainTextEdit</extends>
-   <header location="global">vplaintextedit.h</header>
+   <header>../vwidgets/vplaintextedit.h</header>
   </customwidget>
  </customwidgets>
  <resources>
diff --git a/src/libs/vtools/dialogs/tools/dialogbisector.ui b/src/libs/vtools/dialogs/tools/dialogbisector.ui
index 29e9dce4a..485374cf2 100644
--- a/src/libs/vtools/dialogs/tools/dialogbisector.ui
+++ b/src/libs/vtools/dialogs/tools/dialogbisector.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>405</width>
-    <height>358</height>
+    <height>363</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -374,7 +374,7 @@
   <customwidget>
    <class>VPlainTextEdit</class>
    <extends>QPlainTextEdit</extends>
-   <header location="global">vplaintextedit.h</header>
+   <header>../vwidgets/vplaintextedit.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.ui b/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.ui
index 0d6038518..bd4cc72c3 100644
--- a/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.ui
+++ b/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.ui
@@ -393,7 +393,7 @@
   <customwidget>
    <class>VPlainTextEdit</class>
    <extends>QPlainTextEdit</extends>
-   <header location="global">vplaintextedit.h</header>
+   <header>../vwidgets/vplaintextedit.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/libs/vtools/dialogs/tools/dialogcutarc.ui b/src/libs/vtools/dialogs/tools/dialogcutarc.ui
index 3bd921c16..b8c52e344 100644
--- a/src/libs/vtools/dialogs/tools/dialogcutarc.ui
+++ b/src/libs/vtools/dialogs/tools/dialogcutarc.ui
@@ -328,7 +328,7 @@
   <customwidget>
    <class>VPlainTextEdit</class>
    <extends>QPlainTextEdit</extends>
-   <header location="global">vplaintextedit.h</header>
+   <header>../vwidgets/vplaintextedit.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/libs/vtools/dialogs/tools/dialogcutspline.ui b/src/libs/vtools/dialogs/tools/dialogcutspline.ui
index bd7071a13..be57637e1 100644
--- a/src/libs/vtools/dialogs/tools/dialogcutspline.ui
+++ b/src/libs/vtools/dialogs/tools/dialogcutspline.ui
@@ -320,7 +320,7 @@
   <customwidget>
    <class>VPlainTextEdit</class>
    <extends>QPlainTextEdit</extends>
-   <header location="global">vplaintextedit.h</header>
+   <header>../vwidgets/vplaintextedit.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/libs/vtools/dialogs/tools/dialogcutsplinepath.ui b/src/libs/vtools/dialogs/tools/dialogcutsplinepath.ui
index fe45553d9..01e0e0278 100644
--- a/src/libs/vtools/dialogs/tools/dialogcutsplinepath.ui
+++ b/src/libs/vtools/dialogs/tools/dialogcutsplinepath.ui
@@ -328,7 +328,7 @@
   <customwidget>
    <class>VPlainTextEdit</class>
    <extends>QPlainTextEdit</extends>
-   <header location="global">vplaintextedit.h</header>
+   <header>../vwidgets/vplaintextedit.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/libs/vtools/dialogs/tools/dialogellipticalarc.ui b/src/libs/vtools/dialogs/tools/dialogellipticalarc.ui
index 3829efae6..ccbace2bd 100644
--- a/src/libs/vtools/dialogs/tools/dialogellipticalarc.ui
+++ b/src/libs/vtools/dialogs/tools/dialogellipticalarc.ui
@@ -1104,7 +1104,7 @@
   <customwidget>
    <class>VPlainTextEdit</class>
    <extends>QPlainTextEdit</extends>
-   <header location="global">vplaintextedit.h</header>
+   <header>../vwidgets/vplaintextedit.h</header>
   </customwidget>
  </customwidgets>
  <resources>
diff --git a/src/libs/vtools/dialogs/tools/dialogendline.ui b/src/libs/vtools/dialogs/tools/dialogendline.ui
index ac58763eb..e27cb3fe2 100644
--- a/src/libs/vtools/dialogs/tools/dialogendline.ui
+++ b/src/libs/vtools/dialogs/tools/dialogendline.ui
@@ -570,7 +570,7 @@
   <customwidget>
    <class>VPlainTextEdit</class>
    <extends>QPlainTextEdit</extends>
-   <header location="global">vplaintextedit.h</header>
+   <header>../vwidgets/vplaintextedit.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.ui b/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.ui
index 22669040f..e63534c36 100644
--- a/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.ui
+++ b/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.ui
@@ -252,7 +252,7 @@
   <customwidget>
    <class>VCompleterLineEdit</class>
    <extends>QLineEdit</extends>
-   <header>vlineedit.h</header>
+   <header>../vwidgets/vlineedit.h</header>
   </customwidget>
  </customwidgets>
  <resources>
diff --git a/src/libs/vtools/dialogs/tools/dialogflippingbyline.ui b/src/libs/vtools/dialogs/tools/dialogflippingbyline.ui
index 88019a535..8bcb0bbaf 100644
--- a/src/libs/vtools/dialogs/tools/dialogflippingbyline.ui
+++ b/src/libs/vtools/dialogs/tools/dialogflippingbyline.ui
@@ -252,7 +252,7 @@
   <customwidget>
    <class>VCompleterLineEdit</class>
    <extends>QLineEdit</extends>
-   <header>vlineedit.h</header>
+   <header>../vwidgets/vlineedit.h</header>
   </customwidget>
  </customwidgets>
  <resources>
diff --git a/src/libs/vtools/dialogs/tools/dialoggroup.ui b/src/libs/vtools/dialogs/tools/dialoggroup.ui
index 436f2229f..092c1c361 100644
--- a/src/libs/vtools/dialogs/tools/dialoggroup.ui
+++ b/src/libs/vtools/dialogs/tools/dialoggroup.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>294</width>
-    <height>104</height>
+    <height>107</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -78,7 +78,7 @@
   <customwidget>
    <class>VCompleterLineEdit</class>
    <extends>QLineEdit</extends>
-   <header>vlineedit.h</header>
+   <header>../vwidgets/vlineedit.h</header>
   </customwidget>
  </customwidgets>
  <resources>
diff --git a/src/libs/vtools/dialogs/tools/dialogline.cpp b/src/libs/vtools/dialogs/tools/dialogline.cpp
index 3e04fcc8f..87f84f2c4 100644
--- a/src/libs/vtools/dialogs/tools/dialogline.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogline.cpp
@@ -39,7 +39,7 @@
 #include "../../visualization/visualization.h"
 #include "../../visualization/line/vistoolline.h"
 #include "../ifc/ifcdef.h"
-#include "dialogs/tools/dialogtool.h"
+#include "dialogtool.h"
 #include "ui_dialogline.h"
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.ui b/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.ui
index 6b4ca5976..1ca3ed8cb 100644
--- a/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.ui
+++ b/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.ui
@@ -392,7 +392,7 @@
   <customwidget>
    <class>VPlainTextEdit</class>
    <extends>QPlainTextEdit</extends>
-   <header location="global">vplaintextedit.h</header>
+   <header>../vwidgets/vplaintextedit.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/libs/vtools/dialogs/tools/dialogmove.ui b/src/libs/vtools/dialogs/tools/dialogmove.ui
index b475ff9de..0b49b2d83 100644
--- a/src/libs/vtools/dialogs/tools/dialogmove.ui
+++ b/src/libs/vtools/dialogs/tools/dialogmove.ui
@@ -794,12 +794,12 @@
   <customwidget>
    <class>VCompleterLineEdit</class>
    <extends>QLineEdit</extends>
-   <header>vlineedit.h</header>
+   <header>../vwidgets/vlineedit.h</header>
   </customwidget>
   <customwidget>
    <class>VPlainTextEdit</class>
    <extends>QPlainTextEdit</extends>
-   <header location="global">vplaintextedit.h</header>
+   <header>../vwidgets/vplaintextedit.h</header>
   </customwidget>
  </customwidgets>
  <resources>
diff --git a/src/libs/vtools/dialogs/tools/dialognormal.ui b/src/libs/vtools/dialogs/tools/dialognormal.ui
index 154d3a852..eb7dfaaa4 100644
--- a/src/libs/vtools/dialogs/tools/dialognormal.ui
+++ b/src/libs/vtools/dialogs/tools/dialognormal.ui
@@ -565,7 +565,7 @@
   <customwidget>
    <class>VPlainTextEdit</class>
    <extends>QPlainTextEdit</extends>
-   <header location="global">vplaintextedit.h</header>
+   <header>../vwidgets/vplaintextedit.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp b/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp
index 9955c3aec..9721ee242 100644
--- a/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp
@@ -34,7 +34,7 @@
 
 #include "../../visualization/visualization.h"
 #include "../../visualization/line/vistoolpointfromarcandtangent.h"
-#include "dialogs/tools/dialogtool.h"
+#include "dialogtool.h"
 #include "ui_dialogpointfromarcandtangent.h"
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.ui b/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.ui
index cf91ae0d1..7359668d6 100644
--- a/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.ui
+++ b/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.ui
@@ -349,7 +349,7 @@
   <customwidget>
    <class>VPlainTextEdit</class>
    <extends>QPlainTextEdit</extends>
-   <header location="global">vplaintextedit.h</header>
+   <header>../vwidgets/vplaintextedit.h</header>
   </customwidget>
  </customwidgets>
  <resources>
diff --git a/src/libs/vtools/dialogs/tools/dialogpointofcontact.h b/src/libs/vtools/dialogs/tools/dialogpointofcontact.h
index 5330bdb96..2da5aec73 100644
--- a/src/libs/vtools/dialogs/tools/dialogpointofcontact.h
+++ b/src/libs/vtools/dialogs/tools/dialogpointofcontact.h
@@ -37,7 +37,6 @@
 
 #include "../vmisc/def.h"
 #include "dialogtool.h"
-#include "ui_dialogpointofcontact.h"
 
 namespace Ui
 {
diff --git a/src/libs/vtools/dialogs/tools/dialogpointofcontact.ui b/src/libs/vtools/dialogs/tools/dialogpointofcontact.ui
index 8808f4299..4b90f4560 100644
--- a/src/libs/vtools/dialogs/tools/dialogpointofcontact.ui
+++ b/src/libs/vtools/dialogs/tools/dialogpointofcontact.ui
@@ -383,7 +383,7 @@
   <customwidget>
    <class>VPlainTextEdit</class>
    <extends>QPlainTextEdit</extends>
-   <header location="global">vplaintextedit.h</header>
+   <header>../vwidgets/vplaintextedit.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp b/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp
index 4034baa57..d994aa519 100644
--- a/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp
@@ -37,7 +37,7 @@
 #include "../../visualization/visualization.h"
 #include "../../visualization/line/vistoolpointofintersectionarcs.h"
 #include "../vmisc/vabstractapplication.h"
-#include "dialogs/tools/dialogtool.h"
+#include "dialogtool.h"
 #include "ui_dialogpointofintersectionarcs.h"
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.ui b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.ui
index 64db825df..820b3a0f3 100644
--- a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.ui
+++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.ui
@@ -529,7 +529,7 @@
   <customwidget>
    <class>VPlainTextEdit</class>
    <extends>QPlainTextEdit</extends>
-   <header location="global">vplaintextedit.h</header>
+   <header>../vwidgets/vplaintextedit.h</header>
   </customwidget>
  </customwidgets>
  <resources>
diff --git a/src/libs/vtools/dialogs/tools/dialogrotation.ui b/src/libs/vtools/dialogs/tools/dialogrotation.ui
index 00f232911..16f6e0c6c 100644
--- a/src/libs/vtools/dialogs/tools/dialogrotation.ui
+++ b/src/libs/vtools/dialogs/tools/dialogrotation.ui
@@ -418,12 +418,12 @@
   <customwidget>
    <class>VCompleterLineEdit</class>
    <extends>QLineEdit</extends>
-   <header>vlineedit.h</header>
+   <header>../vwidgets/vlineedit.h</header>
   </customwidget>
   <customwidget>
    <class>VPlainTextEdit</class>
    <extends>QPlainTextEdit</extends>
-   <header location="global">vplaintextedit.h</header>
+   <header>../vwidgets/vplaintextedit.h</header>
   </customwidget>
  </customwidgets>
  <resources>
diff --git a/src/libs/vtools/dialogs/tools/dialogshoulderpoint.ui b/src/libs/vtools/dialogs/tools/dialogshoulderpoint.ui
index 9e06473b0..6c26a65d9 100644
--- a/src/libs/vtools/dialogs/tools/dialogshoulderpoint.ui
+++ b/src/libs/vtools/dialogs/tools/dialogshoulderpoint.ui
@@ -422,7 +422,7 @@
   <customwidget>
    <class>VPlainTextEdit</class>
    <extends>QPlainTextEdit</extends>
-   <header location="global">vplaintextedit.h</header>
+   <header>../vwidgets/vplaintextedit.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/libs/vtools/dialogs/tools/dialogspline.cpp b/src/libs/vtools/dialogs/tools/dialogspline.cpp
index 8376b196e..0a88391dc 100644
--- a/src/libs/vtools/dialogs/tools/dialogspline.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogspline.cpp
@@ -55,7 +55,7 @@
 #include "../vpatterndb/vcontainer.h"
 #include "../vwidgets/vmaingraphicsscene.h"
 #include "ui_dialogspline.h"
-#include "vtranslatevars.h"
+#include "../vpatterndb/vtranslatevars.h"
 #include "../qmuparser/qmudef.h"
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/dialogs/tools/dialogspline.ui b/src/libs/vtools/dialogs/tools/dialogspline.ui
index 9afc1f1cf..c0a0123ef 100644
--- a/src/libs/vtools/dialogs/tools/dialogspline.ui
+++ b/src/libs/vtools/dialogs/tools/dialogspline.ui
@@ -984,7 +984,7 @@
   <customwidget>
    <class>VPlainTextEdit</class>
    <extends>QPlainTextEdit</extends>
-   <header location="global">vplaintextedit.h</header>
+   <header>../vwidgets/vplaintextedit.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp b/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp
index fe15f41de..65fc93776 100644
--- a/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp
@@ -63,7 +63,7 @@
 #include "../vwidgets/vabstractmainwindow.h"
 #include "../vwidgets/vmaingraphicsscene.h"
 #include "ui_dialogsplinepath.h"
-#include "vtranslatevars.h"
+#include "../vpatterndb/vtranslatevars.h"
 #include "../qmuparser/qmudef.h"
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/dialogs/tools/dialogsplinepath.ui b/src/libs/vtools/dialogs/tools/dialogsplinepath.ui
index 2df1d2fd3..e5efb482e 100644
--- a/src/libs/vtools/dialogs/tools/dialogsplinepath.ui
+++ b/src/libs/vtools/dialogs/tools/dialogsplinepath.ui
@@ -961,7 +961,7 @@
   <customwidget>
    <class>VPlainTextEdit</class>
    <extends>QPlainTextEdit</extends>
-   <header location="global">vplaintextedit.h</header>
+   <header>../vwidgets/vplaintextedit.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/libs/vtools/dialogs/tools/piece/dialogpiecepath.cpp b/src/libs/vtools/dialogs/tools/piece/dialogpiecepath.cpp
index 666267ece..0cce7d10b 100644
--- a/src/libs/vtools/dialogs/tools/piece/dialogpiecepath.cpp
+++ b/src/libs/vtools/dialogs/tools/piece/dialogpiecepath.cpp
@@ -30,7 +30,7 @@
 #include "ui_dialogpiecepath.h"
 #include "../vpatterndb/vpiecenode.h"
 #include "../vpatterndb/variables/vincrement.h"
-#include "visualization/path/vistoolpiecepath.h"
+#include "../../../visualization/path/vistoolpiecepath.h"
 #include "../../../tools/vtoolseamallowance.h"
 #include "../../support/dialogeditwrongformula.h"
 #include "../vmisc/vmodifierkey.h"
diff --git a/src/libs/vtools/dialogs/tools/piece/dialogpiecepath.ui b/src/libs/vtools/dialogs/tools/piece/dialogpiecepath.ui
index abf5627fc..189be3c2c 100644
--- a/src/libs/vtools/dialogs/tools/piece/dialogpiecepath.ui
+++ b/src/libs/vtools/dialogs/tools/piece/dialogpiecepath.ui
@@ -21,7 +21,7 @@
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>2</number>
      </property>
      <widget class="QWidget" name="tabPath">
       <attribute name="title">
@@ -1040,7 +1040,6 @@
               <property name="font">
                <font>
                 <pointsize>36</pointsize>
-                <weight>75</weight>
                 <bold>true</bold>
                </font>
               </property>
@@ -1658,7 +1657,7 @@
   <customwidget>
    <class>VPlainTextEdit</class>
    <extends>QPlainTextEdit</extends>
-   <header location="global">vplaintextedit.h</header>
+   <header>../vwidgets/vplaintextedit.h</header>
   </customwidget>
  </customwidgets>
  <resources>
diff --git a/src/libs/vtools/dialogs/tools/piece/dialogpin.cpp b/src/libs/vtools/dialogs/tools/piece/dialogpin.cpp
index 44a322ac2..9ad9df9fe 100644
--- a/src/libs/vtools/dialogs/tools/piece/dialogpin.cpp
+++ b/src/libs/vtools/dialogs/tools/piece/dialogpin.cpp
@@ -28,7 +28,7 @@
 
 #include "dialogpin.h"
 #include "ui_dialogpin.h"
-#include "visualization/line/vistoolspecialpoint.h"
+#include "../../../visualization/line/vistoolspecialpoint.h"
 #if QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
 #include "../vmisc/backport/qoverload.h"
 #endif // QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
diff --git a/src/libs/vtools/dialogs/tools/piece/dialogplacelabel.cpp b/src/libs/vtools/dialogs/tools/piece/dialogplacelabel.cpp
index 3fe3fd764..a7d96794e 100644
--- a/src/libs/vtools/dialogs/tools/piece/dialogplacelabel.cpp
+++ b/src/libs/vtools/dialogs/tools/piece/dialogplacelabel.cpp
@@ -28,7 +28,7 @@
 #include "dialogplacelabel.h"
 #include "ui_dialogplacelabel.h"
 
-#include "visualization/line/vistoolspecialpoint.h"
+#include "../../../visualization/line/vistoolspecialpoint.h"
 #include "../../support/dialogeditwrongformula.h"
 #if QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
 #include "../vmisc/backport/qoverload.h"
diff --git a/src/libs/vtools/dialogs/tools/piece/dialogplacelabel.ui b/src/libs/vtools/dialogs/tools/piece/dialogplacelabel.ui
index 6b0113e46..259a54727 100644
--- a/src/libs/vtools/dialogs/tools/piece/dialogplacelabel.ui
+++ b/src/libs/vtools/dialogs/tools/piece/dialogplacelabel.ui
@@ -846,7 +846,7 @@
   <customwidget>
    <class>VPlainTextEdit</class>
    <extends>QPlainTextEdit</extends>
-   <header location="global">vplaintextedit.h</header>
+   <header>../vwidgets/vplaintextedit.h</header>
   </customwidget>
  </customwidgets>
  <resources>
diff --git a/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp b/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp
index 83c303299..482fddea4 100644
--- a/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp
+++ b/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp
@@ -40,8 +40,8 @@
 #include "../vpatterndb/calculator.h"
 #include "../vpatterndb/variables/vincrement.h"
 #include "../vpatterndb/variables/vmeasurement.h"
-#include "visualization/path/vistoolpiece.h"
-#include "visualization/path/vispiecespecialpoints.h"
+#include "../../../visualization/path/vistoolpiece.h"
+#include "../../../visualization/path/vispiecespecialpoints.h"
 #include "dialogpiecepath.h"
 #include "dialogplacelabel.h"
 #include "../../../undocommands/savepiecepathoptions.h"
diff --git a/src/libs/vtools/dialogs/tools/piece/tabs/tabgrainline.ui b/src/libs/vtools/dialogs/tools/piece/tabs/tabgrainline.ui
index 29b074ae2..98bf02fe3 100644
--- a/src/libs/vtools/dialogs/tools/piece/tabs/tabgrainline.ui
+++ b/src/libs/vtools/dialogs/tools/piece/tabs/tabgrainline.ui
@@ -530,7 +530,7 @@
   <customwidget>
    <class>VPlainTextEdit</class>
    <extends>QPlainTextEdit</extends>
-   <header location="global">vplaintextedit.h</header>
+   <header>../vwidgets/vplaintextedit.h</header>
   </customwidget>
  </customwidgets>
  <resources>
diff --git a/src/libs/vtools/dialogs/tools/piece/tabs/tablabels.ui b/src/libs/vtools/dialogs/tools/piece/tabs/tablabels.ui
index 36305f486..64188ff5e 100644
--- a/src/libs/vtools/dialogs/tools/piece/tabs/tablabels.ui
+++ b/src/libs/vtools/dialogs/tools/piece/tabs/tablabels.ui
@@ -1769,12 +1769,12 @@
   <customwidget>
    <class>VPlainTextEdit</class>
    <extends>QPlainTextEdit</extends>
-   <header location="global">vplaintextedit.h</header>
+   <header>../vwidgets/vplaintextedit.h</header>
   </customwidget>
   <customwidget>
    <class>VLineEdit</class>
    <extends>QLineEdit</extends>
-   <header>vlineedit.h</header>
+   <header>../vwidgets/vlineedit.h</header>
   </customwidget>
  </customwidgets>
  <resources>
diff --git a/src/libs/vtools/dialogs/tools/piece/tabs/tabpassmarks.ui b/src/libs/vtools/dialogs/tools/piece/tabs/tabpassmarks.ui
index e107004f1..340e39c70 100644
--- a/src/libs/vtools/dialogs/tools/piece/tabs/tabpassmarks.ui
+++ b/src/libs/vtools/dialogs/tools/piece/tabs/tabpassmarks.ui
@@ -566,7 +566,7 @@
   <customwidget>
    <class>VPlainTextEdit</class>
    <extends>QPlainTextEdit</extends>
-   <header location="global">vplaintextedit.h</header>
+   <header>../vwidgets/vplaintextedit.h</header>
   </customwidget>
  </customwidgets>
  <resources>
diff --git a/src/libs/vtools/dialogs/tools/piece/tabs/tabpaths.ui b/src/libs/vtools/dialogs/tools/piece/tabs/tabpaths.ui
index e257d60a1..b5657ab83 100644
--- a/src/libs/vtools/dialogs/tools/piece/tabs/tabpaths.ui
+++ b/src/libs/vtools/dialogs/tools/piece/tabs/tabpaths.ui
@@ -1157,12 +1157,12 @@
   <customwidget>
    <class>VPlainTextEdit</class>
    <extends>QPlainTextEdit</extends>
-   <header location="global">vplaintextedit.h</header>
+   <header>../vwidgets/vplaintextedit.h</header>
   </customwidget>
   <customwidget>
    <class>VLineEdit</class>
    <extends>QLineEdit</extends>
-   <header>vlineedit.h</header>
+   <header>../vwidgets/vlineedit.h</header>
   </customwidget>
  </customwidgets>
  <resources>
diff --git a/src/libs/vtools/tools/vtoolseamallowance.cpp b/src/libs/vtools/tools/vtoolseamallowance.cpp
index 75da7eaf8..41aee931e 100644
--- a/src/libs/vtools/tools/vtoolseamallowance.cpp
+++ b/src/libs/vtools/tools/vtoolseamallowance.cpp
@@ -55,14 +55,14 @@
 #if QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
 #include "../vmisc/backport/qoverload.h"
 #endif // QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
-#include "tools/nodeDetails/vtoolpin.h"
-#include "tools/nodeDetails/vnodepoint.h"
-#include "tools/nodeDetails/vtoolpiecepath.h"
-#include "tools/nodeDetails/vnodearc.h"
-#include "tools/nodeDetails/vnodeellipticalarc.h"
-#include "tools/nodeDetails/vnodespline.h"
-#include "tools/nodeDetails/vnodesplinepath.h"
-#include "tools/nodeDetails/vtoolplacelabel.h"
+#include "nodeDetails/vtoolpin.h"
+#include "nodeDetails/vnodepoint.h"
+#include "nodeDetails/vtoolpiecepath.h"
+#include "nodeDetails/vnodearc.h"
+#include "nodeDetails/vnodeellipticalarc.h"
+#include "nodeDetails/vnodespline.h"
+#include "nodeDetails/vnodesplinepath.h"
+#include "nodeDetails/vtoolplacelabel.h"
 
 #include <QFuture>
 #include <QtConcurrent/QtConcurrentRun>
diff --git a/src/libs/vtools/undocommands/addpiece.h b/src/libs/vtools/undocommands/addpiece.h
index c605aa276..35e32ad00 100644
--- a/src/libs/vtools/undocommands/addpiece.h
+++ b/src/libs/vtools/undocommands/addpiece.h
@@ -37,7 +37,7 @@
 #include <QtGlobal>
 
 #include "../tools/vtoolseamallowance.h"
-#include "vpiece.h"
+#include "../vpatterndb/vpiece.h"
 #include "vundocommand.h"
 
 class AddPiece : public VUndoCommand
diff --git a/src/libs/vtools/undocommands/deletepiece.h b/src/libs/vtools/undocommands/deletepiece.h
index a97fd6030..c05b420f0 100644
--- a/src/libs/vtools/undocommands/deletepiece.h
+++ b/src/libs/vtools/undocommands/deletepiece.h
@@ -32,7 +32,7 @@
 #include <QtGlobal>
 
 #include "../tools/vtoolseamallowance.h"
-#include "vpiece.h"
+#include "../vpatterndb/vpiece.h"
 #include "vundocommand.h"
 
 class DeletePiece : public VUndoCommand
diff --git a/src/libs/vtools/undocommands/savepieceoptions.h b/src/libs/vtools/undocommands/savepieceoptions.h
index d68d42273..d20f9de65 100644
--- a/src/libs/vtools/undocommands/savepieceoptions.h
+++ b/src/libs/vtools/undocommands/savepieceoptions.h
@@ -31,7 +31,7 @@
 
 #include <QtGlobal>
 
-#include "vpiece.h"
+#include "../vpatterndb/vpiece.h"
 #include "vundocommand.h"
 
 class SavePieceOptions : public VUndoCommand
diff --git a/src/libs/vtools/visualization/line/vistoolendline.cpp b/src/libs/vtools/visualization/line/vistoolendline.cpp
index 6d7bbc2c4..a46353ed0 100644
--- a/src/libs/vtools/visualization/line/vistoolendline.cpp
+++ b/src/libs/vtools/visualization/line/vistoolendline.cpp
@@ -44,7 +44,7 @@
 #include "../vpatterndb/vcontainer.h"
 #include "../visualization.h"
 #include "visline.h"
-#include "vtranslatevars.h"
+#include "../vpatterndb/vtranslatevars.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VisToolEndLine::VisToolEndLine(const VContainer *data, QGraphicsItem *parent)
diff --git a/src/libs/vtools/visualization/line/vistoolline.cpp b/src/libs/vtools/visualization/line/vistoolline.cpp
index 189a3c1dd..2ad6b9a6b 100644
--- a/src/libs/vtools/visualization/line/vistoolline.cpp
+++ b/src/libs/vtools/visualization/line/vistoolline.cpp
@@ -37,7 +37,7 @@
 #include "../vgeometry/vpointf.h"
 #include "../vpatterndb/vcontainer.h"
 #include "../visualization.h"
-#include "visualization/line/visline.h"
+#include "visline.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VisToolLine::VisToolLine(const VContainer *data, QGraphicsItem *parent)
diff --git a/src/libs/vtools/visualization/line/vistoolpointofintersectionarcs.cpp b/src/libs/vtools/visualization/line/vistoolpointofintersectionarcs.cpp
index a725ba90b..d6e75970d 100644
--- a/src/libs/vtools/visualization/line/vistoolpointofintersectionarcs.cpp
+++ b/src/libs/vtools/visualization/line/vistoolpointofintersectionarcs.cpp
@@ -42,7 +42,7 @@
 #include "../vgeometry/varc.h"
 #include "../vpatterndb/vcontainer.h"
 #include "../visualization.h"
-#include "visualization/line/visline.h"
+#include "../line/visline.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VisToolPointOfIntersectionArcs::VisToolPointOfIntersectionArcs(const VContainer *data, QGraphicsItem *parent)
diff --git a/src/libs/vtools/visualization/path/vistoolarc.cpp b/src/libs/vtools/visualization/path/vistoolarc.cpp
index e8290ac26..d55299cfe 100644
--- a/src/libs/vtools/visualization/path/vistoolarc.cpp
+++ b/src/libs/vtools/visualization/path/vistoolarc.cpp
@@ -40,9 +40,9 @@
 #include "../vgeometry/vpointf.h"
 #include "../vpatterndb/vcontainer.h"
 #include "../visualization.h"
-#include "def.h"
+#include "../vmisc/def.h"
 #include "qnamespace.h"
-#include "vgeometrydef.h"
+#include "../vgeometry/vgeometrydef.h"
 #include "vispath.h"
 #include "../vwidgets/scalesceneitems.h"
 #include "../vmisc/vmodifierkey.h"
diff --git a/src/libs/vtools/visualization/path/vistoolarc.h b/src/libs/vtools/visualization/path/vistoolarc.h
index 3ce230bb5..18daacb0a 100644
--- a/src/libs/vtools/visualization/path/vistoolarc.h
+++ b/src/libs/vtools/visualization/path/vistoolarc.h
@@ -37,7 +37,7 @@
 #include <QtGlobal>
 
 #include "../vmisc/def.h"
-#include "defglobal.h"
+#include "../vmisc/defglobal.h"
 #include "vispath.h"
 
 class VisToolArc final : public VisPath
diff --git a/src/libs/vtools/visualization/path/vistoolarcwithlength.h b/src/libs/vtools/visualization/path/vistoolarcwithlength.h
index c4493e11b..562c31d17 100644
--- a/src/libs/vtools/visualization/path/vistoolarcwithlength.h
+++ b/src/libs/vtools/visualization/path/vistoolarcwithlength.h
@@ -38,7 +38,7 @@
 
 #include "../vmisc/def.h"
 #include "vispath.h"
-#include "defglobal.h"
+#include "../vmisc/defglobal.h"
 
 class VisToolArcWithLength final : public VisPath
 {
diff --git a/src/libs/vtools/visualization/path/vistoolpointofintersectioncurves.cpp b/src/libs/vtools/visualization/path/vistoolpointofintersectioncurves.cpp
index 8d570ffbd..a57e39d9a 100644
--- a/src/libs/vtools/visualization/path/vistoolpointofintersectioncurves.cpp
+++ b/src/libs/vtools/visualization/path/vistoolpointofintersectioncurves.cpp
@@ -40,7 +40,7 @@
 #include "../vpatterndb/vcontainer.h"
 #include "../vwidgets/scalesceneitems.h"
 #include "../visualization.h"
-#include "visualization/path/vispath.h"
+#include "../../visualization/path/vispath.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VisToolPointOfIntersectionCurves::VisToolPointOfIntersectionCurves(const VContainer *data, QGraphicsItem *parent)
diff --git a/src/libs/vtools/vtools.qbs b/src/libs/vtools/vtools.qbs
new file mode 100644
index 000000000..a4421c161
--- /dev/null
+++ b/src/libs/vtools/vtools.qbs
@@ -0,0 +1,485 @@
+VLib {
+    Depends { name: "Qt"; submodules: ["widgets", "xml", "printsupport", "svg"] }
+    Depends { name: "IFCLib"; }
+    Depends { name: "VLayoutLib"; }
+    Depends { name: "VFormatLib"; }
+
+    name: "VToolsLib"
+
+    Group {
+        name: "dialogs"
+        prefix: "dialogs/"
+        files: [
+            "tooldialogs.h",
+            "tools/dialogalongline.h",
+            "tools/dialogarc.h",
+            "tools/dialogarcwithlength.h",
+            "tools/dialogbisector.h",
+            "tools/dialogcurveintersectaxis.h",
+            "tools/dialogcutarc.h",
+            "tools/dialogcutspline.h",
+            "tools/dialogcutsplinepath.h",
+            "tools/dialogendline.h",
+            "tools/dialogheight.h",
+            "tools/dialogline.h",
+            "tools/dialoglineintersect.h",
+            "tools/dialoglineintersectaxis.h",
+            "tools/dialognormal.h",
+            "tools/dialogpointfromarcandtangent.h",
+            "tools/dialogpointfromcircleandtangent.h",
+            "tools/dialogpointofcontact.h",
+            "tools/dialogpointofintersection.h",
+            "tools/dialogpointofintersectionarcs.h",
+            "tools/dialogpointofintersectioncircles.h",
+            "tools/dialogshoulderpoint.h",
+            "tools/dialogsinglepoint.h",
+            "tools/dialogspline.h",
+            "tools/dialogsplinepath.h",
+            "tools/dialogtool.h",
+            "tools/dialogtriangle.h",
+            "tools/dialoguniondetails.h",
+            "support/dialogeditwrongformula.h",
+            "support/dialogundo.h",
+            "tools/dialogtruedarts.h",
+            "tools/dialogpointofintersectioncurves.h",
+            "tools/dialogcubicbezier.h",
+            "tools/dialogcubicbezierpath.h",
+            "tools/dialoggroup.h",
+            "tools/dialogrotation.h",
+            "tools/dialogflippingbyline.h",
+            "tools/dialogflippingbyaxis.h",
+            "tools/dialogmove.h",
+            "tools/dialogellipticalarc.h",
+            "tools/piece/dialogseamallowance.h",
+            "tools/piece/dialogpiecepath.h",
+            "tools/piece/dialogpin.h",
+            "tools/piece/dialoginsertnode.h",
+            "support/dialogeditlabel.h",
+            "tools/piece/dialogplacelabel.h",
+            "tools/piece/dialogduplicatedetail.h",
+            "dialogtoolbox.h",
+            "tools/piece/dialogpatternmaterials.h",
+            "tools/dialogalongline.cpp",
+            "tools/dialogarc.cpp",
+            "tools/dialogarcwithlength.cpp",
+            "tools/dialogbisector.cpp",
+            "tools/dialogcurveintersectaxis.cpp",
+            "tools/dialogcutarc.cpp",
+            "tools/dialogcutspline.cpp",
+            "tools/dialogcutsplinepath.cpp",
+            "tools/dialogendline.cpp",
+            "tools/dialogheight.cpp",
+            "tools/dialogline.cpp",
+            "tools/dialoglineintersect.cpp",
+            "tools/dialoglineintersectaxis.cpp",
+            "tools/dialognormal.cpp",
+            "tools/dialogpointfromarcandtangent.cpp",
+            "tools/dialogpointfromcircleandtangent.cpp",
+            "tools/dialogpointofcontact.cpp",
+            "tools/dialogpointofintersection.cpp",
+            "tools/dialogpointofintersectionarcs.cpp",
+            "tools/dialogpointofintersectioncircles.cpp",
+            "tools/dialogshoulderpoint.cpp",
+            "tools/dialogsinglepoint.cpp",
+            "tools/dialogspline.cpp",
+            "tools/dialogsplinepath.cpp",
+            "tools/dialogtool.cpp",
+            "tools/dialogtriangle.cpp",
+            "tools/dialoguniondetails.cpp",
+            "support/dialogeditwrongformula.cpp",
+            "support/dialogundo.cpp",
+            "tools/dialogtruedarts.cpp",
+            "tools/dialogpointofintersectioncurves.cpp",
+            "tools/dialogcubicbezier.cpp",
+            "tools/dialogcubicbezierpath.cpp",
+            "tools/dialoggroup.cpp",
+            "tools/dialogrotation.cpp",
+            "tools/dialogflippingbyline.cpp",
+            "tools/dialogflippingbyaxis.cpp",
+            "tools/dialogmove.cpp",
+            "tools/dialogellipticalarc.cpp",
+            "tools/piece/dialogseamallowance.cpp",
+            "tools/piece/dialogpiecepath.cpp",
+            "tools/piece/dialogpin.cpp",
+            "tools/piece/dialoginsertnode.cpp",
+            "support/dialogeditlabel.cpp",
+            "tools/piece/dialogplacelabel.cpp",
+            "tools/piece/dialogduplicatedetail.cpp",
+            "dialogtoolbox.cpp",
+            "tools/piece/dialogpatternmaterials.cpp",
+            "tools/dialogalongline.ui",
+            "tools/dialogarc.ui",
+            "tools/dialogarcwithlength.ui",
+            "tools/dialogbisector.ui",
+            "tools/dialogcurveintersectaxis.ui",
+            "tools/dialogcutarc.ui",
+            "tools/dialogcutspline.ui",
+            "tools/dialogcutsplinepath.ui",
+            "tools/dialogendline.ui",
+            "tools/dialogheight.ui",
+            "tools/dialogline.ui",
+            "tools/dialoglineintersect.ui",
+            "tools/dialoglineintersectaxis.ui",
+            "tools/dialognormal.ui",
+            "tools/dialogpointfromarcandtangent.ui",
+            "tools/dialogpointfromcircleandtangent.ui",
+            "tools/dialogpointofcontact.ui",
+            "tools/dialogpointofintersection.ui",
+            "tools/dialogpointofintersectionarcs.ui",
+            "tools/dialogpointofintersectioncircles.ui",
+            "tools/dialogshoulderpoint.ui",
+            "tools/dialogsinglepoint.ui",
+            "tools/dialogspline.ui",
+            "tools/dialogsplinepath.ui",
+            "tools/dialogtriangle.ui",
+            "tools/dialoguniondetails.ui",
+            "support/dialogeditwrongformula.ui",
+            "support/dialogundo.ui",
+            "tools/dialogtruedarts.ui",
+            "tools/dialogpointofintersectioncurves.ui",
+            "tools/dialogcubicbezier.ui",
+            "tools/dialogcubicbezierpath.ui",
+            "tools/dialoggroup.ui",
+            "tools/dialogrotation.ui",
+            "tools/dialogflippingbyline.ui",
+            "tools/dialogflippingbyaxis.ui",
+            "tools/dialogmove.ui",
+            "tools/dialogellipticalarc.ui",
+            "tools/piece/dialogseamallowance.ui",
+            "tools/piece/dialogpiecepath.ui",
+            "tools/piece/dialogpin.ui",
+            "tools/piece/tabs/tabpaths.ui",
+            "tools/piece/tabs/tablabels.ui",
+            "tools/piece/tabs/tabgrainline.ui",
+            "tools/piece/tabs/tabpins.ui",
+            "tools/piece/dialoginsertnode.ui",
+            "tools/piece/tabs/tabpassmarks.ui",
+            "support/dialogeditlabel.ui",
+            "tools/piece/dialogplacelabel.ui",
+            "tools/piece/tabs/tabplacelabels.ui",
+            "tools/piece/dialogduplicatedetail.ui",
+            "tools/piece/dialogpatternmaterials.ui"
+        ]
+    }
+
+    Group {
+        name: "tools"
+        prefix: "tools/"
+        files: [
+            "backgroundimage/vbackgroundimagecontrols.h",
+            "backgroundimage/vbackgroundpixmapitem.h",
+            "backgroundimage/vbackgroundsvgitem.h",
+            "toolsdef.h",
+            "backgroundimage/vbackgroundimageitem.h",
+            "vdatatool.h",
+            "vabstracttool.h",
+            "drawTools/toolpoint/toolsinglepoint/vtooltriangle.h",
+            "drawTools/toolcurve/vtoolsplinepath.h",
+            "drawTools/toolcurve/vtoolspline.h",
+            "drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.h",
+            "drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.h",
+            "drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.h",
+            "drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.h",
+            "drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h",
+            "drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.h",
+            "drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.h",
+            "drawTools/toolpoint/toolsinglepoint/vtoollineintersect.h",
+            "drawTools/vtoolline.h",
+            "drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.h",
+            "drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.h",
+            "drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.h",
+            "drawTools/toolcurve/vtoolarc.h",
+            "drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.h",
+            "drawTools/vdrawtool.h",
+            "nodeDetails/vnodesplinepath.h",
+            "nodeDetails/vnodespline.h",
+            "nodeDetails/vnodepoint.h",
+            "nodeDetails/vnodearc.h",
+            "nodeDetails/vabstractnode.h",
+            "drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.h",
+            "drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.h",
+            "vtooluniondetails.h",
+            "drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.h",
+            "drawTools/toolcurve/vabstractspline.h",
+            "drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.h",
+            "drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.h",
+            "drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.h",
+            "drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.h",
+            "drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.h",
+            "drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.h",
+            "drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.h",
+            "drawTools/toolcurve/vtoolarcwithlength.h",
+            "drawTools/toolpoint/vabstractpoint.h",
+            "drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.h",
+            "drawTools/toolpoint/tooldoublepoint/vtooltruedarts.h",
+            "drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.h",
+            "drawTools/toolcurve/vtoolcubicbezier.h",
+            "drawTools/toolcurve/vtoolcubicbezierpath.h",
+            "drawTools/operation/vtoolrotation.h",
+            "drawTools/operation/flipping/vtoolflippingbyline.h",
+            "drawTools/operation/vabstractoperation.h",
+            "drawTools/operation/flipping/vtoolflippingbyaxis.h",
+            "drawTools/operation/flipping/vabstractflipping.h",
+            "drawTools/operation/vtoolmove.h",
+            "drawTools/toolcurve/vtoolellipticalarc.h",
+            "nodeDetails/vnodeellipticalarc.h",
+            "vtoolseamallowance.h",
+            "nodeDetails/vtoolpiecepath.h",
+            "nodeDetails/vtoolpin.h",
+            "vinteractivetool.h",
+            "nodeDetails/vtoolplacelabel.h",
+            "backgroundimage/vbackgroundimagecontrols.cpp",
+            "backgroundimage/vbackgroundpixmapitem.cpp",
+            "backgroundimage/vbackgroundsvgitem.cpp",
+            "toolsdef.cpp",
+            "backgroundimage/vbackgroundimageitem.cpp",
+            "vdatatool.cpp",
+            "vabstracttool.cpp",
+            "drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp",
+            "drawTools/toolcurve/vtoolsplinepath.cpp",
+            "drawTools/toolcurve/vtoolspline.cpp",
+            "drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.cpp",
+            "drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp",
+            "drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.cpp",
+            "drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp",
+            "drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp",
+            "drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp",
+            "drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.cpp",
+            "drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp",
+            "drawTools/vtoolline.cpp",
+            "drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp",
+            "drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp",
+            "drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp",
+            "drawTools/toolcurve/vtoolarc.cpp",
+            "drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp",
+            "drawTools/vdrawtool.cpp",
+            "nodeDetails/vnodesplinepath.cpp",
+            "nodeDetails/vnodespline.cpp",
+            "nodeDetails/vnodepoint.cpp",
+            "nodeDetails/vnodearc.cpp",
+            "nodeDetails/vabstractnode.cpp",
+            "drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp",
+            "drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp",
+            "vtooluniondetails.cpp",
+            "drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp",
+            "drawTools/toolcurve/vabstractspline.cpp",
+            "drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.cpp",
+            "drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp",
+            "drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp",
+            "drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp",
+            "drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp",
+            "drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp",
+            "drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp",
+            "drawTools/toolcurve/vtoolarcwithlength.cpp",
+            "drawTools/toolpoint/vabstractpoint.cpp",
+            "drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.cpp",
+            "drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp",
+            "drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.cpp",
+            "drawTools/toolcurve/vtoolcubicbezier.cpp",
+            "drawTools/toolcurve/vtoolcubicbezierpath.cpp",
+            "drawTools/operation/vtoolrotation.cpp",
+            "drawTools/operation/flipping/vtoolflippingbyline.cpp",
+            "drawTools/operation/vabstractoperation.cpp",
+            "drawTools/operation/flipping/vtoolflippingbyaxis.cpp",
+            "drawTools/operation/flipping/vabstractflipping.cpp",
+            "drawTools/operation/vtoolmove.cpp",
+            "drawTools/toolcurve/vtoolellipticalarc.cpp",
+            "nodeDetails/vnodeellipticalarc.cpp",
+            "vtoolseamallowance.cpp",
+            "nodeDetails/vtoolpiecepath.cpp",
+            "nodeDetails/vtoolpin.cpp",
+            "vinteractivetool.cpp",
+            "nodeDetails/vtoolplacelabel.cpp"
+        ]
+    }
+
+    Group {
+        name: "undocommands"
+        prefix: "undocommands/"
+        files: [
+            "addtocalc.h",
+            "addpatternpiece.h",
+            "image/addbackgroundimage.h",
+            "image/deletebackgroundimage.h",
+            "image/hideallbackgroundimages.h",
+            "image/hidebackgroundimage.h",
+            "image/holdallbackgroundimages.h",
+            "image/holdbackgroundimage.h",
+            "image/movebackgroundimage.h",
+            "image/opaquebackgroundimage.h",
+            "image/renamebackgroundimage.h",
+            "image/resetbackgroundimage.h",
+            "image/rotatebackgroundimage.h",
+            "image/scalebackgroundimage.h",
+            "image/zvaluemovebackgroundimage.h",
+            "movespoint.h",
+            "movespline.h",
+            "movesplinepath.h",
+            "savetooloptions.h",
+            "deltool.h",
+            "deletepatternpiece.h",
+            "undogroup.h",
+            "vundocommand.h",
+            "renamepp.h",
+            "label/movelabel.h",
+            "label/movedoublelabel.h",
+            "label/moveabstractlabel.h",
+            "label/operationmovelabel.h",
+            "addpiece.h",
+            "deletepiece.h",
+            "movepiece.h",
+            "savepieceoptions.h",
+            "savepiecepathoptions.h",
+            "label/showlabel.h",
+            "label/showdoublelabel.h",
+            "label/operationshowlabel.h",
+            "saveplacelabeloptions.h",
+            "togglepiecestate.h",
+            "addtocalc.cpp",
+            "addpatternpiece.cpp",
+            "image/addbackgroundimage.cpp",
+            "image/deletebackgroundimage.cpp",
+            "image/hideallbackgroundimages.cpp",
+            "image/hidebackgroundimage.cpp",
+            "image/holdallbackgroundimages.cpp",
+            "image/holdbackgroundimage.cpp",
+            "image/movebackgroundimage.cpp",
+            "image/opaquebackgroundimage.cpp",
+            "image/renamebackgroundimage.cpp",
+            "image/resetbackgroundimage.cpp",
+            "image/rotatebackgroundimage.cpp",
+            "image/scalebackgroundimage.cpp",
+            "image/zvaluemovebackgroundimage.cpp",
+            "movespoint.cpp",
+            "movespline.cpp",
+            "movesplinepath.cpp",
+            "savetooloptions.cpp",
+            "deltool.cpp",
+            "deletepatternpiece.cpp",
+            "undogroup.cpp",
+            "vundocommand.cpp",
+            "renamepp.cpp",
+            "label/movelabel.cpp",
+            "label/movedoublelabel.cpp",
+            "label/moveabstractlabel.cpp",
+            "label/operationmovelabel.cpp",
+            "addpiece.cpp",
+            "deletepiece.cpp",
+            "movepiece.cpp",
+            "savepieceoptions.cpp",
+            "savepiecepathoptions.cpp",
+            "label/showlabel.cpp",
+            "label/showdoublelabel.cpp",
+            "label/operationshowlabel.cpp",
+            "saveplacelabeloptions.cpp",
+            "togglepiecestate.cpp",
+        ]
+    }
+
+    Group {
+        name: "visualization"
+        prefix: "visualization/"
+        files: [
+            "visualization.h",
+            "line/visline.h",
+            "line/vistoolline.h",
+            "line/vistoolendline.h",
+            "line/vistoolalongline.h",
+            "line/vistoolbisector.h",
+            "line/vistoolshoulderpoint.h",
+            "line/vistoolnormal.h",
+            "line/vistoolheight.h",
+            "line/vistoolpointofintersection.h",
+            "line/vistooltriangle.h",
+            "line/vistoolpointofcontact.h",
+            "line/vistoollineintersect.h",
+            "line/vistoollineintersectaxis.h",
+            "line/vistooltruedarts.h",
+            "line/vistoolcurveintersectaxis.h",
+            "line/vistoolpointofintersectionarcs.h",
+            "line/vistoolpointofintersectioncircles.h",
+            "line/vistoolpointfromcircleandtangent.h",
+            "line/vistoolpointfromarcandtangent.h",
+            "line/operation/vistoolrotation.h",
+            "line/operation/vistoolflippingbyline.h",
+            "path/vispath.h",
+            "path/vistoolarc.h",
+            "path/vistoolcutarc.h",
+            "path/vistoolspline.h",
+            "path/vistoolcutspline.h",
+            "path/vistoolsplinepath.h",
+            "path/vistoolcutsplinepath.h",
+            "path/vistoolarcwithlength.h",
+            "path/vistoolpointofintersectioncurves.h",
+            "path/vistoolcubicbezier.h",
+            "path/vistoolcubicbezierpath.h",
+            "line/operation/visoperation.h",
+            "line/operation/vistoolflippingbyaxis.h",
+            "line/operation/vistoolmove.h",
+            "path/vistoolellipticalarc.h",
+            "path/vistoolpiece.h",
+            "path/vistoolpiecepath.h",
+            "path/vispiecespecialpoints.h",
+            "line/vistoolspecialpoint.h",
+            "path/vistoolduplicatedetail.h",
+            "visualization.cpp",
+            "line/visline.cpp",
+            "line/vistoolline.cpp",
+            "line/vistoolendline.cpp",
+            "line/vistoolalongline.cpp",
+            "line/vistoolbisector.cpp",
+            "line/vistoolshoulderpoint.cpp",
+            "line/vistoolnormal.cpp",
+            "line/vistoolheight.cpp",
+            "line/vistoolpointofintersection.cpp",
+            "line/vistooltriangle.cpp",
+            "line/vistoolpointofcontact.cpp",
+            "line/vistoollineintersect.cpp",
+            "line/vistoollineintersectaxis.cpp",
+            "line/vistooltruedarts.cpp",
+            "line/vistoolcurveintersectaxis.cpp",
+            "line/vistoolpointofintersectionarcs.cpp",
+            "line/vistoolpointofintersectioncircles.cpp",
+            "line/vistoolpointfromcircleandtangent.cpp",
+            "line/vistoolpointfromarcandtangent.cpp",
+            "line/operation/vistoolrotation.cpp",
+            "line/operation/vistoolflippingbyline.cpp",
+            "path/vispath.cpp",
+            "path/vistoolarc.cpp",
+            "path/vistoolcutarc.cpp",
+            "path/vistoolspline.cpp",
+            "path/vistoolcutspline.cpp",
+            "path/vistoolsplinepath.cpp",
+            "path/vistoolcutsplinepath.cpp",
+            "path/vistoolarcwithlength.cpp",
+            "path/vistoolpointofintersectioncurves.cpp",
+            "path/vistoolcubicbezier.cpp",
+            "path/vistoolcubicbezierpath.cpp",
+            "line/operation/visoperation.cpp",
+            "line/operation/vistoolflippingbyaxis.cpp",
+            "line/operation/vistoolmove.cpp",
+            "path/vistoolellipticalarc.cpp",
+            "path/vistoolpiece.cpp",
+            "path/vistoolpiecepath.cpp",
+            "path/vispiecespecialpoints.cpp",
+            "line/vistoolspecialpoint.cpp",
+            "path/vistoolduplicatedetail.cpp"
+        ]
+    }
+
+    Group {
+        name: "Precompiled headers"
+        files: {
+            var files = ["stable.h"];
+            if (qbs.targetOS.contains("windows"))
+                files.push("stable.cpp")
+            return files;
+        }
+        fileTags: ["cpp_pch_src"]
+    }
+
+    Export {
+        Depends { name: "cpp" }
+        cpp.includePaths: [exportingProduct.sourceDirectory]
+    }
+}
diff --git a/src/libs/vwidgets/vwidgets.qbs b/src/libs/vwidgets/vwidgets.qbs
new file mode 100644
index 000000000..34ea849d1
--- /dev/null
+++ b/src/libs/vwidgets/vwidgets.qbs
@@ -0,0 +1,79 @@
+VLib {
+    Depends { name: "Qt"; submodules: ["widgets", "printsupport"] }
+    Depends { name: "VMiscLib" }
+    Depends { name: "VPropertyExplorerLib" }
+
+    name: "VWidgetsLib"
+    files: [
+        "qtcolorpicker.cpp",
+        "vcomboboxdelegate.cpp",
+        "vdecorationaligningdelegate.cpp",
+        "velidedlabel.cpp",
+        "vmaingraphicsscene.cpp",
+        "vmaingraphicsview.cpp",
+        "vwidgetpopup.cpp",
+        "vcontrolpointspline.cpp",
+        "vgraphicssimpletextitem.cpp",
+        "vsimplepoint.cpp",
+        "vabstractsimple.cpp",
+        "vnobrushscalepathitem.cpp",
+        "vsimplecurve.cpp",
+        "vabstractmainwindow.cpp",
+        "vtextgraphicsitem.cpp",
+        "vgrainlineitem.cpp",
+        "vpieceitem.cpp",
+        "fancytabbar/fancytab.cpp",
+        "fancytabbar/fancytabbar.cpp",
+        "fancytabbar/stylehelper.cpp",
+        "vcurvepathitem.cpp",
+        "global.cpp",
+        "vscenepoint.cpp",
+        "scalesceneitems.cpp",
+        "vlineedit.cpp",
+        "vplaintextedit.cpp",
+        "vhighlighter.cpp",
+        "qtcolorpicker.h",
+        "vcomboboxdelegate.h",
+        "vdecorationaligningdelegate.h",
+        "velidedlabel.h",
+        "vmaingraphicsscene.h",
+        "vmaingraphicsview.h",
+        "vwidgetpopup.h",
+        "vcontrolpointspline.h",
+        "vgraphicssimpletextitem.h",
+        "vsimplepoint.h",
+        "vabstractsimple.h",
+        "vnobrushscalepathitem.h",
+        "vsimplecurve.h",
+        "vabstractmainwindow.h",
+        "vtextgraphicsitem.h",
+        "vgrainlineitem.h",
+        "vpieceitem.h",
+        "fancytabbar/fancytab.h",
+        "fancytabbar/fancytabbar.h",
+        "fancytabbar/stylehelper.h",
+        "vcurvepathitem.h",
+        "global.h",
+        "vscenepoint.h",
+        "scalesceneitems.h",
+        "vlineedit.h",
+        "vplaintextedit.h",
+        "vhighlighter.h"
+    ]
+
+    Group {
+        name: "Precompiled headers"
+        files: {
+            var files = ["stable.h"];
+            if (qbs.targetOS.contains("windows"))
+                files.push("stable.cpp")
+            return files;
+        }
+        fileTags: ["cpp_pch_src"]
+    }
+
+    Export {
+        Depends { name: "cpp" }
+        cpp.includePaths: [exportingProduct.sourceDirectory]
+    }
+}
diff --git a/src/src.qbs b/src/src.qbs
new file mode 100644
index 000000000..704b7a2a4
--- /dev/null
+++ b/src/src.qbs
@@ -0,0 +1,7 @@
+Project {
+    references: [
+        "app/app.qbs",
+        "libs/libs.qbs",
+        //"test/test.qbs",
+    ]
+}
diff --git a/valentina.qbs b/valentina.qbs
new file mode 100644
index 000000000..79718f73c
--- /dev/null
+++ b/valentina.qbs
@@ -0,0 +1,10 @@
+Project {
+    name: "Valentina"
+    minimumQbsVersion: "1.16"
+    references: [
+        "src/src.qbs",
+    ]
+    qbsSearchPaths: "qbs"
+
+    AutotestRunner {}
+}