From 1f0afcaa7684afcd9ce1be48ef3a95b611e35bfd Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 20 Mar 2024 13:51:50 +0100 Subject: [PATCH] Qmake: Do not warn if build directory is child of source dir We changed the default build directory to be in a "build" subdirectory of the source directory, which should not trigger this warning. Fixes: QTCREATORBUG-30562 Change-Id: Ie9e6906602844fa08c187b92423839484a1cea92 Reviewed-by: Christian Kandeler --- src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp index f3a71728d00..496ddb76c13 100644 --- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp +++ b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp @@ -372,7 +372,8 @@ QString QmakeBuildConfiguration::unalignedBuildDirWarning() bool QmakeBuildConfiguration::isBuildDirAtSafeLocation(const FilePath &sourceDir, const FilePath &buildDir) { - return buildDir.path().count('/') == sourceDir.path().count('/'); + return buildDir.path().count('/') == sourceDir.path().count('/') + || buildDir.isChildOf(sourceDir); } bool QmakeBuildConfiguration::isBuildDirAtSafeLocation() const