diff --git a/qbs/modules/buildconfig/buildconfig.qbs b/qbs/modules/buildconfig/buildconfig.qbs index 3b5d6d578..2e6c5b783 100644 --- a/qbs/modules/buildconfig/buildconfig.qbs +++ b/qbs/modules/buildconfig/buildconfig.qbs @@ -792,4 +792,17 @@ Module { } vcs2.headerFileName: "vcsRepoState.h" + + Group { + name: "Precompiled headers" + condition: buildconfig.enablePCH + prefix: FileInfo.joinPaths(product.sourceDirectory, FileInfo.pathSeparator()) + files: { + var files = ["stable.h"]; + if (qbs.toolchain.contains("msvc")) + files.push("stable.cpp") + return files; + } + fileTags: ["cpp_pch_src"] + } } diff --git a/src/app/puzzle/puzzle.qbs b/src/app/puzzle/puzzle.qbs index 3041dd720..f513b2b02 100644 --- a/src/app/puzzle/puzzle.qbs +++ b/src/app/puzzle/puzzle.qbs @@ -159,18 +159,6 @@ VApp { ] } - Group { - name: "Precompiled headers" - condition: buildconfig.enablePCH - files: { - var files = ["stable.h"]; - if (qbs.targetOS.contains("windows")) - files.push("stable.cpp") - return files; - } - fileTags: ["cpp_pch_src"] - } - cpp.includePaths: [product.sourceDirectory] Export { diff --git a/src/app/tape/tape.qbs b/src/app/tape/tape.qbs index f64691de6..3a582d68d 100644 --- a/src/app/tape/tape.qbs +++ b/src/app/tape/tape.qbs @@ -84,18 +84,6 @@ VApp { ] } - Group { - name: "Precompiled headers" - condition: buildconfig.enablePCH - files: { - var files = ["stable.h"]; - if (qbs.toolchain.contains("msvc")) - files.push("stable.cpp") - return files; - } - fileTags: ["cpp_pch_src"] - } - Export { Depends { name: "cpp" } cpp.defines: { diff --git a/src/app/valentina/valentina.qbs b/src/app/valentina/valentina.qbs index 67de82e34..fd6ca3e23 100644 --- a/src/app/valentina/valentina.qbs +++ b/src/app/valentina/valentina.qbs @@ -164,18 +164,6 @@ VApp { qbs.installDir: "share/pixmaps" } - Group { - name: "Precompiled headers" - condition: buildconfig.enablePCH - files: { - var files = ["stable.h"]; - if (qbs.toolchain.contains("msvc")) - files.push("stable.cpp") - return files; - } - fileTags: ["cpp_pch_src"] - } - Export { Depends { name: "cpp" } cpp.defines: { diff --git a/src/libs/fervor/fervor.qbs b/src/libs/fervor/fervor.qbs index b17093fdb..ad94fc539 100644 --- a/src/libs/fervor/fervor.qbs +++ b/src/libs/fervor/fervor.qbs @@ -13,18 +13,6 @@ VLib { "fvupdatewindow.ui", ] - Group { - name: "Precompiled headers" - condition: buildconfig.enablePCH - files: { - var files = ["stable.h"]; - if (qbs.toolchain.contains("msvc")) - files.push("stable.cpp") - return files; - } - fileTags: ["cpp_pch_src"] - } - Export { Depends { name: "cpp" } Depends { name: "Qt"; submodules: ["network"] } diff --git a/src/libs/ifc/ifc.qbs b/src/libs/ifc/ifc.qbs index b0893d9ec..76b79c458 100644 --- a/src/libs/ifc/ifc.qbs +++ b/src/libs/ifc/ifc.qbs @@ -70,18 +70,6 @@ VLib { ] } - Group { - name: "Precompiled headers" - condition: buildconfig.enablePCH - files: { - var files = ["stable.h"]; - if (qbs.toolchain.contains("msvc")) - files.push("stable.cpp") - return files; - } - fileTags: ["cpp_pch_src"] - } - Group { name: "Resources" files: [ diff --git a/src/libs/qmuparser/qmuparser.qbs b/src/libs/qmuparser/qmuparser.qbs index c306c0fd0..58f28c0ad 100644 --- a/src/libs/qmuparser/qmuparser.qbs +++ b/src/libs/qmuparser/qmuparser.qbs @@ -36,18 +36,6 @@ VLib { buildconfig.staticBuild: false - Group { - name: "Precompiled headers" - condition: buildconfig.enablePCH - files: { - var files = ["stable.h"]; - if (qbs.toolchain.contains("msvc")) - files.push("stable.cpp") - return files; - } - fileTags: ["cpp_pch_src"] - } - Export { Depends { name: "cpp" } cpp.includePaths: [exportingProduct.sourceDirectory] diff --git a/src/libs/vdxf/vdxf.qbs b/src/libs/vdxf/vdxf.qbs index 9acee20c0..136507126 100644 --- a/src/libs/vdxf/vdxf.qbs +++ b/src/libs/vdxf/vdxf.qbs @@ -45,18 +45,6 @@ VLib { ] } - Group { - name: "Precompiled headers" - condition: buildconfig.enablePCH - files: { - var files = ["stable.h"]; - if (qbs.toolchain.contains("msvc")) - files.push("stable.cpp") - return files; - } - fileTags: ["cpp_pch_src"] - } - Export { Depends { name: "cpp" } cpp.includePaths: [exportingProduct.sourceDirectory] diff --git a/src/libs/vformat/vformat.qbs b/src/libs/vformat/vformat.qbs index 848539912..554dd2402 100644 --- a/src/libs/vformat/vformat.qbs +++ b/src/libs/vformat/vformat.qbs @@ -16,18 +16,6 @@ VLib { "vwatermark.h", ] - Group { - name: "Precompiled headers" - condition: buildconfig.enablePCH - files: { - var files = ["stable.h"]; - if (qbs.toolchain.contains("msvc")) - files.push("stable.cpp") - return files; - } - fileTags: ["cpp_pch_src"] - } - Export { Depends { name: "cpp" } Depends { name: "Qt"; submodules: ["xml"] } diff --git a/src/libs/vgeometry/vgeometry.qbs b/src/libs/vgeometry/vgeometry.qbs index 1acf8b898..f391ea318 100644 --- a/src/libs/vgeometry/vgeometry.qbs +++ b/src/libs/vgeometry/vgeometry.qbs @@ -53,18 +53,6 @@ VLib { "vplacelabelitem_p.h" ] - Group { - name: "Precompiled headers" - condition: buildconfig.enablePCH - files: { - var files = ["stable.h"]; - if (qbs.toolchain.contains("msvc")) - files.push("stable.cpp") - return files; - } - fileTags: ["cpp_pch_src"] - } - Export { Depends { name: "cpp" } Depends { name: "Qt"; submodules: ["gui"] } diff --git a/src/libs/vlayout/vlayout.qbs b/src/libs/vlayout/vlayout.qbs index 74d6cc69a..a0a61e78a 100644 --- a/src/libs/vlayout/vlayout.qbs +++ b/src/libs/vlayout/vlayout.qbs @@ -72,18 +72,6 @@ VLib { ] } - Group { - name: "Precompiled headers" - condition: buildconfig.enablePCH - files: { - var files = ["stable.h"]; - if (qbs.toolchain.contains("msvc")) - files.push("stable.cpp") - return files; - } - fileTags: ["cpp_pch_src"] - } - Group { name: "Resources" prefix: "share/" diff --git a/src/libs/vmisc/vmisc.qbs b/src/libs/vmisc/vmisc.qbs index c3059653b..abd9b8617 100644 --- a/src/libs/vmisc/vmisc.qbs +++ b/src/libs/vmisc/vmisc.qbs @@ -118,18 +118,6 @@ VLib { ] } - Group { - name: "Precompiled headers" - condition: buildconfig.enablePCH - files: { - var files = ["stable.h"]; - if (qbs.toolchain.contains("msvc")) - files.push("stable.cpp") - return files; - } - fileTags: ["cpp_pch_src"] - } - Group { name: "Resources" prefix: "share/resources/" diff --git a/src/libs/vobj/vobj.qbs b/src/libs/vobj/vobj.qbs index bb9494293..0b2b91852 100644 --- a/src/libs/vobj/vobj.qbs +++ b/src/libs/vobj/vobj.qbs @@ -12,18 +12,6 @@ VLib { "vobjpaintdevice.h", ] - Group { - name: "Precompiled headers" - condition: buildconfig.enablePCH - files: { - var files = ["stable.h"]; - if (qbs.toolchain.contains("msvc")) - files.push("stable.cpp") - return files; - } - fileTags: ["cpp_pch_src"] - } - Export { Depends { name: "cpp" } cpp.includePaths: [exportingProduct.sourceDirectory] diff --git a/src/libs/vpatterndb/vpatterndb.qbs b/src/libs/vpatterndb/vpatterndb.qbs index 565a2a161..ea2f4ef4a 100644 --- a/src/libs/vpatterndb/vpatterndb.qbs +++ b/src/libs/vpatterndb/vpatterndb.qbs @@ -98,18 +98,6 @@ VLib { ] } - Group { - name: "Precompiled headers" - condition: buildconfig.enablePCH - files: { - var files = ["stable.h"]; - if (qbs.toolchain.contains("msvc")) - files.push("stable.cpp") - return files; - } - fileTags: ["cpp_pch_src"] - } - Export { Depends { name: "cpp" } cpp.includePaths: [exportingProduct.sourceDirectory] diff --git a/src/libs/vpropertyexplorer/vpropertyexplorer.qbs b/src/libs/vpropertyexplorer/vpropertyexplorer.qbs index 1ec0341a7..62052233d 100644 --- a/src/libs/vpropertyexplorer/vpropertyexplorer.qbs +++ b/src/libs/vpropertyexplorer/vpropertyexplorer.qbs @@ -88,18 +88,6 @@ VLib { ] } - Group { - name: "Precompiled headers" - condition: buildconfig.enablePCH - files: { - var files = ["stable.h"]; - if (qbs.toolchain.contains("msvc")) - files.push("stable.cpp") - return files; - } - fileTags: ["cpp_pch_src"] - } - Export { Depends { name: "cpp" } cpp.includePaths: [exportingProduct.sourceDirectory] diff --git a/src/libs/vtest/vtest.qbs b/src/libs/vtest/vtest.qbs index 5a2d8b296..024a1f1af 100644 --- a/src/libs/vtest/vtest.qbs +++ b/src/libs/vtest/vtest.qbs @@ -13,18 +13,6 @@ VLib { "abstracttest.h", ] - Group { - name: "Precompiled headers" - condition: buildconfig.enablePCH - files: { - var files = ["stable.h"]; - if (qbs.toolchain.contains("msvc")) - files.push("stable.cpp") - return files; - } - fileTags: ["cpp_pch_src"] - } - Export { Depends { name: "cpp" } cpp.includePaths: [exportingProduct.sourceDirectory] diff --git a/src/libs/vtools/vtools.qbs b/src/libs/vtools/vtools.qbs index 92a61ccb2..409f8b2b9 100644 --- a/src/libs/vtools/vtools.qbs +++ b/src/libs/vtools/vtools.qbs @@ -468,18 +468,6 @@ VLib { ] } - Group { - name: "Precompiled headers" - condition: buildconfig.enablePCH - files: { - var files = ["stable.h"]; - if (qbs.toolchain.contains("msvc")) - files.push("stable.cpp") - return files; - } - fileTags: ["cpp_pch_src"] - } - Export { Depends { name: "cpp" } cpp.includePaths: [exportingProduct.sourceDirectory] diff --git a/src/libs/vwidgets/vwidgets.qbs b/src/libs/vwidgets/vwidgets.qbs index f342b8b5b..1f68787a9 100644 --- a/src/libs/vwidgets/vwidgets.qbs +++ b/src/libs/vwidgets/vwidgets.qbs @@ -61,18 +61,6 @@ VLib { "vhighlighter.h" ] - Group { - name: "Precompiled headers" - condition: buildconfig.enablePCH - files: { - var files = ["stable.h"]; - if (qbs.toolchain.contains("msvc")) - files.push("stable.cpp") - return files; - } - fileTags: ["cpp_pch_src"] - } - Export { Depends { name: "cpp" } cpp.includePaths: [exportingProduct.sourceDirectory] diff --git a/src/test/CollectionTest/CollectionTest.qbs b/src/test/CollectionTest/CollectionTest.qbs index 5f710766f..951b32bb9 100644 --- a/src/test/CollectionTest/CollectionTest.qbs +++ b/src/test/CollectionTest/CollectionTest.qbs @@ -22,18 +22,6 @@ VApp { "tst_valentinacommandline.h", ] - Group { - name: "Precompiled headers" - condition: buildconfig.enablePCH - files: { - var files = ["stable.h"]; - if (qbs.toolchain.contains("msvc")) - files.push("stable.cpp") - return files; - } - fileTags: ["cpp_pch_src"] - } - Group { name: "Tape test files" prefix: "tst_tape" + FileInfo.pathSeparator() diff --git a/src/test/ParserTest/ParserTest.qbs b/src/test/ParserTest/ParserTest.qbs index c2bcccb01..9f2b035fa 100644 --- a/src/test/ParserTest/ParserTest.qbs +++ b/src/test/ParserTest/ParserTest.qbs @@ -14,16 +14,4 @@ VApp { files: [ "main.cpp" ] - - Group { - name: "Precompiled headers" - condition: buildconfig.enablePCH - files: { - var files = ["stable.h"]; - if (qbs.toolchain.contains("msvc")) - files.push("stable.cpp") - return files; - } - fileTags: ["cpp_pch_src"] - } } diff --git a/src/test/TranslationsTest/TranslationsTest.qbs b/src/test/TranslationsTest/TranslationsTest.qbs index c9d6ae204..d15e55b24 100644 --- a/src/test/TranslationsTest/TranslationsTest.qbs +++ b/src/test/TranslationsTest/TranslationsTest.qbs @@ -31,17 +31,5 @@ VApp { "tst_abstracttranslation.h", ] - Group { - name: "Precompiled headers" - condition: buildconfig.enablePCH - files: { - var files = ["stable.h"]; - if (qbs.toolchain.contains("msvc")) - files.push("stable.cpp") - return files; - } - fileTags: ["cpp_pch_src"] - } - cpp.defines: 'TS_DIR="' + FileInfo.joinPaths(project.sourceDirectory, "share", "translations") + '"' } diff --git a/src/test/ValentinaTest/ValentinaTest.qbs b/src/test/ValentinaTest/ValentinaTest.qbs index a81cbc43f..657db4dbc 100644 --- a/src/test/ValentinaTest/ValentinaTest.qbs +++ b/src/test/ValentinaTest/ValentinaTest.qbs @@ -67,16 +67,4 @@ VApp { "tst_vabstractpiece.h", "tst_vtooluniondetails.h", ] - - Group { - name: "Precompiled headers" - condition: buildconfig.enablePCH - files: { - var files = ["stable.h"]; - if (qbs.toolchain.contains("msvc")) - files.push("stable.cpp") - return files; - } - fileTags: ["cpp_pch_src"] - } }