diff options
author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2011-10-28 11:32:26 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-04 12:37:27 +0100 |
commit | 26a1b84ae02845c67bb849ab98a170f4b686a136 (patch) | |
tree | 880abd04bba046ff8e665ba74064a37fa6bba6f5 /mkspecs/win32-msvc2005/qmake.conf | |
parent | aa7e89e8072f1ec36f8a25637fee81933364b201 (diff) |
Revert "Fixed deployment problems with MSVC 2005 and 2008 SP1"
This reverts commit ec41d27565ed0b4d517f30563def135d0b4c7a8d.
Adding the define _BIND_TO_CURRENT_VCLIBS_VERSION led to linking problems
for several people. Also, this leads to problems when using the binary
installer for development.
Change-Id: I4097c8d0962c633bab6edbb86df9046d93148cab
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'mkspecs/win32-msvc2005/qmake.conf')
-rw-r--r-- | mkspecs/win32-msvc2005/qmake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/win32-msvc2005/qmake.conf b/mkspecs/win32-msvc2005/qmake.conf index 98bb01fc0f..d4b9521b6d 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 _BIND_TO_CURRENT_VCLIBS_VERSION=1 +DEFINES += UNICODE WIN32 QT_LARGEFILE_SUPPORT QMAKE_COMPILER_DEFINES += _MSC_VER=1400 WIN32 QMAKE_CC = cl |