Qbs: add explicit resolve method

conan/internal/api/new/qbs_lib.py

@@ -21,6 +21,7 @@ def build(self):
         qbs = Qbs(self)
         qbs_config = {"products.{{name}}.isShared": "true" if self.options.shared else "false"}
         qbs.add_configuration("default", qbs_config)
+        qbs.resolve()
         qbs.build()
 
     def package(self):
@@ -67,6 +68,7 @@ def requirements(self):
 
     def build(self):
         qbs = Qbs(self)
+        qbs.resolve()
         qbs.build()
         qbs.install()
 

conan/tools/qbs/qbs.py

@@ -44,7 +44,26 @@ def _get_common_arguments(self):
             '--file', self._project_file,
         ]
 
+    def resolve(self, parallel=True):
+        args = self._get_common_arguments()
+
+        if parallel:
+            args.extend(['--jobs', '%s' % self.jobs])
+        else:
+            args.extend(['--jobs', '1'])
+
+        if self.profile:
+            args.append('profile:%s' % self.profile)
+
+        for name in self._configuration:
+            config = self._configuration[name]
+            args.extend(_configuration_dict_to_commandlist(name, config))
+
+        cmd = 'qbs resolve %s' % cmd_args_to_string(args)
+        self._conanfile.run(cmd)
+
     def _build(self, products, all_products):
+
         args = self._get_common_arguments()
         args.append('--no-install')
 
@@ -55,12 +74,8 @@ def _build(self, products, all_products):
 
         args.extend(['--jobs', '%s' % self.jobs])
 
-        if self.profile:
-            args.append('profile:%s' % self.profile)
-
         for name in self._configuration:
-            config = self._configuration[name]
-            args.extend(_configuration_dict_to_commandlist(name, config))
+            args.append('config:%s' % name)
 
         cmd = 'qbs build %s' % cmd_args_to_string(args)
         self._conanfile.run(cmd)

test/functional/toolchains/qbs/test_qbs.py

@@ -50,6 +50,7 @@ class Recipe(ConanFile):
 
         def build(self):
             qbs = Qbs(self)
+            qbs.resolve()
             qbs.build_all()
         ''')
 
@@ -89,6 +90,7 @@ class Recipe(ConanFile):
 
         def build(self):
             qbs = Qbs(self)
+            qbs.resolve()
             qbs.build(products=["hello", "hello"])
         ''')
 
@@ -130,6 +132,7 @@ def build(self):
             qbs = Qbs(self)
             qbs.add_configuration("release", {"qbs.debugInformation": False})
             qbs.add_configuration("debug", {"qbs.debugInformation": True})
+            qbs.resolve()
             qbs.build()
         ''')