Skip to content

Commit

Permalink
Fix CONFIG += cmdline testcase creating app bundle paths in Makefiles
Browse files Browse the repository at this point in the history
Fix an issue where qmake on macOS will generate a Makefile with a path
to a macOS bundle instead of a bundle-less executable in the Makefile's
check rule if cmdline is specified before testcase in the CONFIG
options.

Fixes: QTBUG-80280
Change-Id: Icc9ee1355b0641981ce79526b36f29957e1afb00
Reviewed-by: Joerg Bornemann <[email protected]>
  • Loading branch information
linville committed Nov 28, 2019
1 parent 14ae881 commit d60b71d
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions mkspecs/features/testcase.prf
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ testcase_exceptions: CONFIG += exceptions
# Set in qt_build_config.prf
testcase_no_bundle: CONFIG -= app_bundle

# cmdline may have been specified and not processed yet
cmdline: CONFIG -= app_bundle

# Allow testcases to mark themselves as not supporting high-DPI
testcase_lowdpi {
macos {
Expand Down

0 comments on commit d60b71d

Please sign in to comment.