Commit e7cb808b authored by Jocelyn Turcotte's avatar Jocelyn Turcotte
Browse files

<tools/gyp> FIXUP: Allow letting qmake do the link step


ld expects the -l switches to appear after the dependent object on
the command line. It works if we use QT_PRIVATE to trigger Qt being
added to the link line since it would be appended to LIBS_PRIVATE as
well. But QT will append to LIBS, which is listed first in the
Makefile and would cause undefined symbol errors by following .o
files.

Fix the issue by adding .o files to OBJECTS instead of LIBS_PRIVATE.
This will only work if all Qt-dependent code is listed in the
top-level gyp file, but we've been keeping it layered that way since
the beginning and it should be acceptable to require it.

Change-Id: I3b655ce8d6525fb986ca87fb9c2863a239ebf991
Reviewed-by: default avatarAndras Becsi <andras.becsi@digia.com>
parent c1af9f4f
Showing with 9 additions and 4 deletions
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment