summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-02-22 10:57:32 +0100
committerJonathan Liu <net147@gmail.com>2016-02-26 13:58:46 +0000
commit5f359baacdf92fabcece83f0a2b30f74c7c02a3c (patch)
tree79f7345f23b6fa49c40d048af40504d42d6a85dc
parent5cd506a8e1bcad3d0b414827db51b907e9f4a94b (diff)
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 commit 5dd4bb67cfce812fd7686e43616e2069f354a7df) Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
-rw-r--r--Tools/qmake/mkspecs/features/default_post.prf1
1 files changed, 1 insertions, 0 deletions
diff --git a/Tools/qmake/mkspecs/features/default_post.prf b/Tools/qmake/mkspecs/features/default_post.prf
index 67276b74b..39bb3f7ae 100644
--- a/Tools/qmake/mkspecs/features/default_post.prf
+++ b/Tools/qmake/mkspecs/features/default_post.prf
@@ -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 {