Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'mer-stable' into 'mer-stable'
Fix linking with libpthread

WebKit use libpthread directly but is depending on other qt modules
causing it to be linked against,  which might break unless -lpthread
is last. Instead just add it explicitly after the static libraries.

Change-Id: I2b95cff2c96373f8dce6f95052c4fccbe1982b33
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

(cherry-picked from qtwebkit/5dd4bb67cfce812fd7686e43616e2069f354a7df)

See merge request !9
  • Loading branch information
rainemak committed May 7, 2016
2 parents 5d75db6 + 46a5330 commit 775d9c9
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions qtwebkit/Tools/qmake/mkspecs/features/default_post.prf
Expand Up @@ -201,6 +201,7 @@ needToLink() {
linkAgainstLibrary($$library, $$eval(WEBKIT.$${library_identifier}.root_source_dir))
LIBS += $$eval(WEBKIT.$${library_identifier}.dependent_libs)
}
posix:!darwin: LIBS += -lpthread
}

creating_module {
Expand Down

0 comments on commit 775d9c9

Please sign in to comment.