Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Return right toolchain generator for Qbs #8553

Merged
merged 2 commits into from
Feb 25, 2021
Merged

Return right toolchain generator for Qbs #8553

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f54f189
Return right toolchain generator for Qbs
Feb 25, 2021
c33b31f
Use right or operator
Feb 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions conans/client/generators/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,9 @@ def _new_generator(self, generator_name, output):
elif generator_name == "CMakeDeps":
from conan.tools.cmake import CMakeDeps
return CMakeDeps
elif generator_name == "QbsToolchain":
from conan.tools.qbs.qbstoolchain import QbsToolchain
return QbsToolchain
elif generator_name == "QbsToolchain" or generator_name == "QbsProfile":
from conan.tools.qbs.qbsprofile import QbsProfile
return QbsProfile
else:
raise ConanException("Internal Conan error: Generator '{}' "
"not commplete".format(generator_name))
Expand Down