diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-02-15 19:28:28 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-18 15:52:43 +0100 |
| commit | 489d8a0627c46092d20f476d5521ecafd42e5ce5 (patch) | |
| tree | 60e78d7ad6044def49a6516e1f3e178e58986c7f /mkspecs/features/resolve_config.prf | |
| parent | 2e4ce301f98d3f463a7151c21dc8cc407cd8702c (diff) | |
add QT_CONFIG's static/shared to CONFIG on startup
... instead of as a fallback in default_post.
it was this way in qt4, and it requires less code to be written in the
end. we are already doing it for debug/release as well.
Change-Id: I6e02849d61d14a18375cf64a5990768931ebac48
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'mkspecs/features/resolve_config.prf')
| -rw-r--r-- | mkspecs/features/resolve_config.prf | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/mkspecs/features/resolve_config.prf b/mkspecs/features/resolve_config.prf index e85435cf73..41e82b2382 100644 --- a/mkspecs/features/resolve_config.prf +++ b/mkspecs/features/resolve_config.prf @@ -14,11 +14,6 @@ staticlib: \ else: dll: \ CONFIG += shared -!shared:!static { - contains(QT_CONFIG, static): CONFIG += static - else: CONFIG += shared -} - CONFIG(static, static|shared) { CONFIG -= shared dll contains(TEMPLATE, ".*lib"): CONFIG += staticlib |