diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@nokia.com> | 2010-10-05 16:23:57 (GMT) |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@nokia.com> | 2010-10-05 19:11:58 (GMT) |
| commit | 9c2361fa3b0ce2417a26537a3ecfe17c2b3ca6d1 (patch) | |
| tree | 3216013c2d34a8396753aa89881f908e346e68c7 | |
| parent | d75dad653d651eb725b238ad9db4dccd6a1f1d2e (diff) | |
| download | Qt-9c2361fa3b0ce2417a26537a3ecfe17c2b3ca6d1.zip Qt-9c2361fa3b0ce2417a26537a3ecfe17c2b3ca6d1.tar.gz Qt-9c2361fa3b0ce2417a26537a3ecfe17c2b3ca6d1.tar.bz2 | |
qmake: Include -pthread when reducing duplicate library arguments
Reviwed-by: Simon Hausmann <simon.hausmann@nokia.com>
| -rw-r--r-- | qmake/generators/unix/unixmake.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp index c26fcb4..71a6061 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -638,7 +638,7 @@ UnixMakefileGenerator::processPrlFiles() (Option::target_mode == Option::TARG_MACX_MODE && opt.startsWith("-F"))) { if(!lflags[arch].contains(opt)) lflags[arch].append(opt); - } else if(opt.startsWith("-l")) { + } else if(opt.startsWith("-l") || opt == "-pthread") { // Make sure we keep the dependency-order of libraries if (lflags[arch].contains(opt)) lflags[arch].removeAll(opt); |