diff options
author | Jake Petroules <jake.petroules@qt.io> | 2016-04-22 11:20:25 -0700 |
---|---|---|
committer | Jake Petroules <jake.petroules@qt.io> | 2016-04-29 16:23:19 +0000 |
commit | a16582bd37475773f6c5ba7f1f643484cf5c3271 (patch) | |
tree | e5e9b4c055f4c0683b5f1e6987cdbc52dd4e33e2 /src/lib/corelib/corelib.qbs | |
parent | 8500d2e6586c01a4fa955afa7601746b41001ee8 (diff) |
Do extensive validation on the value of qbs.toolchain.
qbs now enforces the order of the items in the toolchain list, ensures
that there are no duplicates, and ensures that all implied values are
present in the list (for example, clang implies llvm implies gcc).
Users can now rely on appropriate values always being present (like
llvm, or gcc), and on the order of the toolchain list.
Change-Id: I9abcee9265a8ac9539639128bb4b624353c155ec
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Diffstat (limited to 'src/lib/corelib/corelib.qbs')
-rw-r--r-- | src/lib/corelib/corelib.qbs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/corelib/corelib.qbs b/src/lib/corelib/corelib.qbs index d20378764..2a0a5de90 100644 --- a/src/lib/corelib/corelib.qbs +++ b/src/lib/corelib/corelib.qbs @@ -369,6 +369,7 @@ QbsLibrary { "setupprojectparameters.cpp", "shellutils.cpp", "shellutils.h", + "toolchains.cpp", "version.cpp", "version.h", "visualstudioversioninfo.cpp", @@ -396,6 +397,7 @@ QbsLibrary { "settings.h", "settingsmodel.h", "setupprojectparameters.h", + "toolchains.h", ] qbs.install: project.installApiHeaders qbs.installDir: headerInstallPrefix + "/tools" |