qmake plugin ignores source-subdir parameter?

[LazyT]

Bug Description

Looks like the "source-subdir" is being ignored for the qmake plugin (snapcraft 8.5.1) here.

It looks for the project file in the src dir, not the subdir.

Setting the "qmake-project-file" to the file doesn't work either, only including the subdir path sources/project.pro works.

Is this a bug or am I doing something wrong?

Thanks!

To Reproduce

Try to build a minimal project.

part yaml

parts:
  test:
    plugin: qmake
    source: https://<some git repo>
    source-type: git
    source-subdir: sources
    qmake-major-version: 6
    (qmake-project-file: project.pro

Relevant log output

Without qmake-project-file:
Cannot read /root/parts/test/src: file to open is a directory

With qmake-project-file:
Cannot find file: /root/parts/test/src/project.pro

[lengau]

I've not reproduced this myself, but the source code makes sense that this would be the case:

craft-parts/craft_parts/plugins/qmake_plugin.py

Lines 120 to 123 in 1a2631e

	str(self._part_info.part_src_dir / options.qmake_project_file)
	)
	else:
	qmake_configure_command.append(str(self._part_info.part_src_dir))

I believe we need to change both references to part_src_dir here to reference part_build_subdir instead.

[syncronize-issues-to-jira]

Thank you for reporting your feedback to us!

The internal ticket has been created: https://warthogs.atlassian.net/browse/CRAFT-3857.

This message was autogenerated