diff options
| author | Sergio Martins <sergio.martins@kdab.com> | 2014-02-11 20:28:10 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-15 14:45:07 +0100 |
| commit | b963a7bc27d491f218abbaee8e9d28d09166bdd4 (patch) | |
| tree | 8c53acc3faa4df8de2a930fe0f0bb57a93907c43 | |
| parent | fccb376dad07f730281e93c5aafcba5b1fd689c9 (diff) | |
| download | qtwebkit-b963a7bc27d491f218abbaee8e9d28d09166bdd4.tar.gz | |
Don't use thin archives when building static webkit.
For a static build, we need normal .a files since we're not
going to install .o files. Otherwise we can't use the libs
once the build-dir is cleaned.
Change-Id: I4cbde310cbdb0f24e3397e970a4aea9c8572f6c7
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
| -rw-r--r-- | Tools/qmake/mkspecs/features/default_pre.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Tools/qmake/mkspecs/features/default_pre.prf b/Tools/qmake/mkspecs/features/default_pre.prf index 38443a4f3..829a0e814 100644 --- a/Tools/qmake/mkspecs/features/default_pre.prf +++ b/Tools/qmake/mkspecs/features/default_pre.prf @@ -95,7 +95,7 @@ CONFIG += include_webinspector contains(QT_CONFIG, c++11): CONFIG += c++11 # Limit the creation of thin archives to Linux, since only GNU's ar supports it. -!debug_and_release:linux-g++*: CONFIG += gnu_thin_archives +!debug_and_release:linux-g++*:!contains(QT_CONFIG, static) CONFIG += gnu_thin_archives # Pick up Qt's defaults for debug/release/debug_and_release if(win32|mac):!macx-xcode { |