diff options
| author | Florent Chantret <florent@chantret.com> | 2011-04-04 15:12:51 (GMT) |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2011-04-05 09:07:26 (GMT) |
| commit | ec41d27565ed0b4d517f30563def135d0b4c7a8d (patch) | |
| tree | 43d00a922837ee6973eeae9b772c56214a03cca4 /mkspecs | |
| parent | afec234f5903f00690f9ed6fa83fac22ec0a8f23 (diff) | |
| download | Qt-ec41d27565ed0b4d517f30563def135d0b4c7a8d.zip Qt-ec41d27565ed0b4d517f30563def135d0b4c7a8d.tar.gz Qt-ec41d27565ed0b4d517f30563def135d0b4c7a8d.tar.bz2 | |
Fixed deployment problems with MSVC 2005 and 2008 SP1
Notably, DLLs bundled with MSVC Express SP1 releases are only the ones
from the SP1, so it is a good idea to force binding to the latest
release of the runtime to avoid deployment problems.
Keep in mind that it is easier to bundle a private runtime for the
software in an setup EXE rather than lauching a runtime setup from the
software setup.
Task-number: QTBUG-8215
Merge-request: 1171
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/win32-msvc2005/qmake.conf | 2 | ||||
| -rw-r--r-- | mkspecs/win32-msvc2008/qmake.conf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/win32-msvc2005/qmake.conf b/mkspecs/win32-msvc2005/qmake.conf index 5b717e7..a9f725c 100644 --- a/mkspecs/win32-msvc2005/qmake.conf +++ b/mkspecs/win32-msvc2005/qmake.conf @@ -8,7 +8,7 @@ MAKEFILE_GENERATOR = MSVC.NET TEMPLATE = app CONFIG += qt warn_on release incremental flat link_prl precompile_header autogen_precompile_source copy_dir_files debug_and_release debug_and_release_target embed_manifest_dll embed_manifest_exe QT += core gui -DEFINES += UNICODE WIN32 QT_LARGEFILE_SUPPORT +DEFINES += UNICODE WIN32 QT_LARGEFILE_SUPPORT _BIND_TO_CURRENT_VCLIBS_VERSION=1 QMAKE_COMPILER_DEFINES += _MSC_VER=1400 WIN32 QMAKE_CC = cl diff --git a/mkspecs/win32-msvc2008/qmake.conf b/mkspecs/win32-msvc2008/qmake.conf index c765562..fd115e7 100644 --- a/mkspecs/win32-msvc2008/qmake.conf +++ b/mkspecs/win32-msvc2008/qmake.conf @@ -8,7 +8,7 @@ MAKEFILE_GENERATOR = MSVC.NET TEMPLATE = app CONFIG += qt warn_on release incremental flat link_prl precompile_header autogen_precompile_source copy_dir_files debug_and_release debug_and_release_target embed_manifest_dll embed_manifest_exe QT += core gui -DEFINES += UNICODE WIN32 QT_LARGEFILE_SUPPORT +DEFINES += UNICODE WIN32 QT_LARGEFILE_SUPPORT _BIND_TO_CURRENT_VCLIBS_VERSION=1 QMAKE_COMPILER_DEFINES += _MSC_VER=1500 WIN32 QMAKE_CC = cl |