Successful build of main binaries.

2023-01-04 18:31:50 +02:00 · 2023-01-04 18:31:50 +02:00 · eb38a1c26f
commit eb38a1c26f
parent e896617c92
109 changed files with 2451 additions and 115 deletions
--- a/qbs/imports/VApp.qbs
+++ 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"
+    }
+}
--- a/qbs/imports/VLib.qbs
+++ 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
+    }
+}
--- a/qbs/modules/buildconfig/buildconfig.qbs
+++ 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"
+}
--- a/qbs/modules/vcs2/vcs2.qbs
+++ 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];
+        }
+    }
+}
--- a/src/app/app.qbs
+++ b/src/app/app.qbs
@ -0,0 +1,7 @@
+Project {
+    references: [
+        "valentina/valentina.qbs",
+        "puzzle/puzzle.qbs",
+        "tape/tape.qbs",
+    ]
+}
--- 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)
--- 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),
--- 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
 {
--- a/src/app/puzzle/puzzle.qbs
+++ 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
+    }
+}
--- 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"

--- 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)
 {
--- 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),
--- 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)
--- a/src/app/tape/tape.qbs
+++ 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"]
+    }
+}
--- 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>
--- 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
--- 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

--- 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>
--- 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"
--- 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),
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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"
--- 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>
--- a/src/app/valentina/valentina.qbs
+++ 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"]
+    }
+}
--- a/src/libs/fervor/fervor.qbs
+++ 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]
+    }
+}
--- a/src/libs/ifc/ifc.qbs
+++ 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]
+    }
+}
--- 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"
--- 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"

 /*
--- a/src/libs/libs.qbs
+++ 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",
+    ]
+}
--- a/src/libs/qmuparser/qmuparser.qbs
+++ 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]
+    }
+}
--- a/src/libs/vdxf/vdxf.qbs
+++ 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]
+    }
+}
--- a/src/libs/vformat/vformat.qbs
+++ 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]
+    }
+}
--- a/src/libs/vgeometry/vgeometry.qbs
+++ 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]
+    }
+}
--- 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>
--- 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;
--- a/src/libs/vlayout/vlayout.qbs
+++ 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]
+    }
+}
--- 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++")
--- 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
 {
--- 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) :
--- 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
 {
--- 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()
--- 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
--- a/src/libs/vmisc/vmisc.qbs
+++ 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
+        }
+    }
+}
--- a/src/libs/vobj/vobj.qbs
+++ 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]
+    }
+}
--- 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
--- a/src/libs/vpatterndb/vpatterndb.qbs
+++ 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]
+    }
+}
--- a/src/libs/vpropertyexplorer/vpropertyexplorer.qbs
+++ 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]
+    }
+}
--- a/src/libs/vtest/vtest.qbs
+++ 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]
+    }
+}
--- 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>
--- 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>
--- 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>
--- 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>
--- 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
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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"

 //---------------------------------------------------------------------------------------------------------------------
--- 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>
--- 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>
--- 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>
--- 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"

 //---------------------------------------------------------------------------------------------------------------------
--- 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>
--- 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
 {
--- 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>
--- 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"

 //---------------------------------------------------------------------------------------------------------------------
--- 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>
--- 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>
--- 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>
--- 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"

 //---------------------------------------------------------------------------------------------------------------------
--- 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>
--- 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"

 //---------------------------------------------------------------------------------------------------------------------
--- 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>
--- 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"
--- 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>
--- 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)
--- 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"
--- 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>
--- 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"
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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
--- 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
--- 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
--- 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)
--- 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)
--- a/Show More
+++ b/Show More