Optimize dependencies with Export item.

src/app/puzzle/puzzle.qbs

@@ -2,7 +2,7 @@ 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: "Qt"; submodules: ["widgets", "svg"] }
     Depends { name: "VMiscLib" }
     Depends { name: "VLayoutLib" }
     Depends { name: "IFCLib" }

src/app/puzzle/vpsettings.h

@@ -30,7 +30,7 @@
 
 #include <QByteArray>
 
-#include "vcommonsettings.h"
+#include "../vmisc/vcommonsettings.h"
 
 class VPSettings : public VCommonSettings
 {

src/app/tape/tape.qbs

@@ -2,10 +2,9 @@ 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: "Qt"; submodules: ["widgets", "svg"] }
     Depends { name: "VMiscLib"; }
     Depends { name: "VPatternDBLib"; }
-    Depends { name: "IFCLib"; }
     Depends { name: "FervorLib"; }
     Depends { name: "QMUParserLib"; }
     Depends { name: "VFormatLib"; }

src/app/valentina/valentina.qbs

@@ -2,8 +2,7 @@ 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: "Qt"; submodules: ["widgets", "svg", "xmlpatterns", "concurrent"] }
-    Depends { name: "VPropertyExplorerLib" }
     Depends { name: "VPatternDBLib"; }
     Depends { name: "VWidgetsLib"; }
     Depends { name: "FervorLib"; }
@@ -11,6 +10,7 @@ VApp {
     Depends { name: "VLayoutLib"; }
     Depends { name: "VToolsLib"; }
     Depends { name: "VFormatLib"; }
+    Depends { name: "VMiscLib"; }
 
     Depends {
         name: "Qt.winextras"

src/libs/fervor/fervor.qbs

@@ -1,6 +1,6 @@
 VLib {
-    Depends { name: "Qt"; submodules: ["widgets", "network", "printsupport", "xml"] }
+    Depends { name: "Qt"; submodules: ["widgets", "network"] }
-    Depends { name: "VMiscLib" }
+    Depends { name: "IFCLib" }
 
     name: "FervorLib"
     files: [
@@ -26,6 +26,7 @@ VLib {
 
     Export {
         Depends { name: "cpp" }
+        Depends { name: "Qt"; submodules: ["network"] }
         cpp.includePaths: [exportingProduct.sourceDirectory]
     }
 }

src/libs/ifc/ifc.qbs

@@ -1,5 +1,5 @@
 VLib {
-    Depends { name: "Qt"; submodules: ["gui", "xml", "printsupport", "svg", "xmlpatterns", "concurrent"] }
+    Depends { name: "Qt"; submodules: ["gui", "xml", "svg", "xmlpatterns", "concurrent"] }
     Depends { name: "VMiscLib" }
 
     name: "IFCLib"
@@ -90,6 +90,8 @@ VLib {
 
     Export {
         Depends { name: "cpp" }
+        Depends { name: "Qt"; submodules: ["xml"] }
+        Depends { name: "VMiscLib" }
         cpp.includePaths: [exportingProduct.sourceDirectory]
     }
 }

src/libs/ifc/xml/vabstractpattern.h

@@ -44,7 +44,6 @@
 #include "../vmisc/def.h"
 #include "vdomdocument.h"
 #include "vtoolrecord.h"
-#include "../vlayout/vtextmanager.h"
 
 class QDomElement;
 class VPiecePath;

src/libs/vdxf/vdxf.qbs

@@ -1,6 +1,6 @@
 VLib {
     Depends { name: "VMiscLib" }
-    Depends { name: "Qt"; submodules: ["gui", "printsupport"] }
+    Depends { name: "Qt"; submodules: ["gui"] }
 
     name: "VDXFLib"
     files: [

src/libs/vformat/vformat.qbs

@@ -1,6 +1,6 @@
 VLib {
-    Depends { name: "Qt"; submodules: ["xml", "printsupport"] }
+    Depends { name: "Qt"; submodules: ["xml"] }
-    Depends { name: "VMiscLib" }
+    Depends { name: "IFCLib" }
 
     name: "VFormatLib"
     files: [
@@ -29,6 +29,7 @@ VLib {
 
     Export {
         Depends { name: "cpp" }
+        Depends { name: "Qt"; submodules: ["xml"] }
         cpp.includePaths: [exportingProduct.sourceDirectory]
     }
 }

src/libs/vgeometry/vgeometry.qbs

@@ -1,6 +1,7 @@
 VLib {
-    Depends { name: "Qt"; submodules: ["gui", "printsupport", "concurrent"] }
+    Depends { name: "Qt"; submodules: ["gui", "concurrent"] }
     Depends { name: "VMiscLib"}
+    Depends { name: "IFCLib"}
 
     name: "VGeometryLib"
     files: [
@@ -65,6 +66,8 @@ VLib {
 
     Export {
         Depends { name: "cpp" }
+        Depends { name: "Qt"; submodules: ["gui"] }
+        Depends { name: "VMiscLib"}
         cpp.includePaths: [exportingProduct.sourceDirectory]
     }
 }

src/libs/vlayout/vlayout.qbs

@@ -1,5 +1,5 @@
 VLib {
-    Depends { name: "Qt"; submodules: ["gui", "widgets", "printsupport", "concurrent", "svg", "xml"] }
+    Depends { name: "Qt"; submodules: ["concurrent", "svg"] }
     Depends { name: "VMiscLib" }
     Depends { name: "VGeometryLib" }
     Depends { name: "VPatternDBLib" }

src/libs/vmisc/vmisc.qbs

@@ -1,6 +1,5 @@
 VLib {
-    Depends { name: "Qt"; submodules: ["widgets", "printsupport"] }
+    Depends { name: "Qt"; submodules: ["printsupport"] }
-    Depends { name: "qbs"; }
 
     name: "VMiscLib"
     files: [
@@ -143,9 +142,7 @@ VLib {
 
     Export {
         Depends { name: "cpp" }
-        cpp.includePaths: {
+        Depends { name: "Qt"; submodules: ["printsupport"] }
-            console.info(exportingProduct.sourceDirectory)
+        cpp.includePaths: [exportingProduct.sourceDirectory]
-            return exportingProduct.sourceDirectory
-        }
     }
 }

src/libs/vpatterndb/vpatterndb.qbs

@@ -1,6 +1,5 @@
 VLib {
     Depends { name: "VMiscLib" }
-    Depends { name: "Qt"; submodules: ["printsupport", "xml"] }
     Depends { name: "IFCLib" }
     Depends { name: "VGeometryLib" }
 

src/libs/vpropertyexplorer/vpropertyexplorer.qbs

@@ -1,5 +1,5 @@
 VLib {
-    Depends { name: "Qt"; submodules: ["widgets"] }
+    Depends { name: "Qt"; submodules: ["gui", "widgets"] }
     Depends { name: "VMiscLib" }
 
     name: "VPropertyExplorerLib"

src/libs/vtest/vtest.qbs

@@ -1,8 +1,8 @@
 VLib {
-    Depends { name: "Qt"; submodules: ["testlib", "gui", "printsupport"] }
+    Depends { name: "Qt"; submodules: ["testlib"] }
     Depends { name: "VGeometryLib" }
+    Depends { name: "VPatternDBLib" }
     Depends { name: "VLayoutLib" }
-    Depends { name: "IFCLib" }
 
     name: "VTestLib"
     files: [

src/libs/vtools/vtools.qbs

@@ -1,8 +1,9 @@
 VLib {
-    Depends { name: "Qt"; submodules: ["widgets", "xml", "printsupport", "svg"] }
+    Depends { name: "Qt"; submodules: ["widgets", "xml", "svg"] }
     Depends { name: "IFCLib"; }
     Depends { name: "VLayoutLib"; }
     Depends { name: "VFormatLib"; }
+    Depends { name: "VWidgetsLib"; }
 
     name: "VToolsLib"
 

src/libs/vwidgets/vwidgets.qbs

@@ -1,5 +1,5 @@
 VLib {
-    Depends { name: "Qt"; submodules: ["widgets", "printsupport"] }
+    Depends { name: "Qt"; submodules: ["widgets"] }
     Depends { name: "VMiscLib" }
     Depends { name: "VPropertyExplorerLib" }
 

src/test/ValentinaTest/ValentinaTest.qbs

@@ -1,9 +1,12 @@
 VApp {
     Depends { name: "buildconfig" }
     Depends { name: "VTestLib" }
-    Depends { name: "Qt"; submodules: ["testlib", "xml", "gui", "printsupport"] }
+    Depends { name: "Qt"; submodules: ["testlib"] }
-    Depends { name: "VMiscLib" }
     Depends { name: "VToolsLib" }
+    Depends { name: "VGeometryLib" }
+    Depends { name: "IFCLib" }
+    Depends { name: "VDXFLib" }
+    Depends { name: "VFormatLib" }
 
     name: "ValentinaTest"
     buildconfig.appTarget: qbs.targetOS.contains("macos") ? "ValentinaTest" : "valentinaTest"