diff --git a/qbs/imports/QtcPlugin.qbs b/qbs/imports/QtcPlugin.qbs index d06f99385e4..f4ee221695f 100644 --- a/qbs/imports/QtcPlugin.qbs +++ b/qbs/imports/QtcPlugin.qbs @@ -46,6 +46,6 @@ QtcProduct { Export { Depends { name: "cpp" } Depends { name: "ExtensionSystem" } - cpp.includePaths: ".." + cpp.includePaths: exportingProduct.sourceDirectory + "/.." } } diff --git a/src/libs/3rdparty/libvterm/vterm.qbs b/src/libs/3rdparty/libvterm/vterm.qbs index e35658908da..4c3a08e519e 100644 --- a/src/libs/3rdparty/libvterm/vterm.qbs +++ b/src/libs/3rdparty/libvterm/vterm.qbs @@ -30,6 +30,6 @@ QtcLibrary { Export { Depends { name: "cpp" } - cpp.includePaths: "include" + cpp.includePaths: exportingProduct.sourceDirectory + "/include" } } diff --git a/src/libs/modelinglib/modelinglib.qbs b/src/libs/modelinglib/modelinglib.qbs index 9929bf33c03..54ad0cad64c 100644 --- a/src/libs/modelinglib/modelinglib.qbs +++ b/src/libs/modelinglib/modelinglib.qbs @@ -396,8 +396,8 @@ QtcLibrary { Export { cpp.includePaths: [ - ".", - "./qtserialization/inc" + exportingProduct.sourceDirectory, + exportingProduct.sourceDirectory + "/qtserialization/inc" ] } } diff --git a/src/libs/solutions/spinner/spinner.qbs b/src/libs/solutions/spinner/spinner.qbs index d02858d0484..74fefc89875 100644 --- a/src/libs/solutions/spinner/spinner.qbs +++ b/src/libs/solutions/spinner/spinner.qbs @@ -14,7 +14,7 @@ QtcLibrary { Export { Depends { name: "cpp" } - cpp.includePaths: ".." + cpp.includePaths: exportingProduct.sourceDirectory + "/.." } } diff --git a/src/libs/solutions/tasking/tasking.qbs b/src/libs/solutions/tasking/tasking.qbs index 3b69d7449ff..f0601530d1c 100644 --- a/src/libs/solutions/tasking/tasking.qbs +++ b/src/libs/solutions/tasking/tasking.qbs @@ -22,7 +22,10 @@ QtcLibrary { Export { Depends { name: "cpp" } - cpp.includePaths: ["..", "../.."] + cpp.includePaths: [ + exportingProduct.sourceDirectory + "/..", + exportingProduct.sourceDirectory + "/../.." + ] } } diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs index afc0f202aa7..e73c9ef9230 100644 --- a/src/libs/utils/utils.qbs +++ b/src/libs/utils/utils.qbs @@ -475,6 +475,6 @@ QtcLibrary { Export { Depends { name: "Qt"; submodules: ["concurrent", "widgets" ] } Depends { name: "Tasking" } - cpp.includePaths: "mimetypes2" + cpp.includePaths: exportingProduct.sourceDirectory + "/mimetypes2" } }