diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2012-06-21 20:33:07 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-24 13:38:55 (GMT) |
| commit | 2bba0eadc1570f29331285738b9d319687f84d4c (patch) | |
| tree | ebf1e6a2803fad12720b92cf374c7ca35ca31b81 /mkspecs/win32-msvc2012 | |
| parent | 6df3a1e606490c8f070949f5b3cf790f62a0742a (diff) | |
| download | Qt-2bba0eadc1570f29331285738b9d319687f84d4c.zip Qt-2bba0eadc1570f29331285738b9d319687f84d4c.tar.gz Qt-2bba0eadc1570f29331285738b9d319687f84d4c.tar.bz2 | |
Avoid macro re-definition after 65bd0bd1f047f6db6d67a8f089a9a409354b95a1
based on qt5/qtbase: a9ba92740670ddbbcb0c68f80ad1a18cf2ff0598
Change-Id: Ie036d502950f5e3c0b0297d480af6cfd351e3db0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'mkspecs/win32-msvc2012')
| -rw-r--r-- | mkspecs/win32-msvc2012/qmake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/win32-msvc2012/qmake.conf b/mkspecs/win32-msvc2012/qmake.conf index a649604..875978b 100644 --- a/mkspecs/win32-msvc2012/qmake.conf +++ b/mkspecs/win32-msvc2012/qmake.conf @@ -8,7 +8,7 @@ MAKEFILE_GENERATOR = MSBUILD 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 QMAKE_COMPILER_DEFINES += _MSC_VER=1700 WIN32 QMAKE_CC = cl |