diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-20 11:50:04 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-20 22:08:29 +0100 |
| commit | dcb710dd87ab15c3af803133ff2449902dbec036 (patch) | |
| tree | 1f3ed87165f05e45260ff45fb15d5df96d684abb /tools | |
| parent | 4606ea53958df33fffba680dd75c8b1733ca9f40 (diff) | |
| parent | e47c2744e6cefa42fc70320e07d534742934f737 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
mkspecs/features/unix/separate_debug_info.prf
src/gui/kernel/qwindow_p.h
src/plugins/platforms/cocoa/qcocoacursor.mm
tests/auto/tools/moc/tst_moc.cpp
Change-Id: Ieb57834c00f961a747ffe51e6eb9fc9612cebccf
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 3d9c0c8ab4..29c1e4a661 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -3029,6 +3029,7 @@ void Configure::generateQConfigPri() configStream << "CONFIG+= "; configStream << dictionary[ "BUILD" ]; + configStream << (dictionary[ "SHARED" ] == "no" ? " static" : " shared"); if (dictionary[ "LTCG" ] == "yes") configStream << " ltcg"; |