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 | |
| 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')
| -rw-r--r-- | mkspecs/unsupported/win32-g++-cross/qmake.conf | 2 | ||||
| -rw-r--r-- | mkspecs/win32-g++/qmake.conf | 2 | ||||
| -rw-r--r-- | mkspecs/win32-icc/qmake.conf | 2 | ||||
| -rw-r--r-- | mkspecs/win32-msvc2003/qmake.conf | 2 | ||||
| -rw-r--r-- | mkspecs/win32-msvc2005/qmake.conf | 2 | ||||
| -rw-r--r-- | mkspecs/win32-msvc2008/qmake.conf | 2 | ||||
| -rw-r--r-- | mkspecs/win32-msvc2010/qmake.conf | 2 | ||||
| -rw-r--r-- | mkspecs/win32-msvc2012/qmake.conf | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/mkspecs/unsupported/win32-g++-cross/qmake.conf b/mkspecs/unsupported/win32-g++-cross/qmake.conf index bfd9899..f8f9886 100644 --- a/mkspecs/unsupported/win32-g++-cross/qmake.conf +++ b/mkspecs/unsupported/win32-g++-cross/qmake.conf @@ -8,7 +8,7 @@ MAKEFILE_GENERATOR = MINGW TEMPLATE = app CONFIG += qt warn_on release link_prl copy_dir_files debug_and_release debug_and_release_target precompile_header QT += core gui -DEFINES += UNICODE QT_LARGEFILE_SUPPORT +DEFINES += UNICODE QMAKE_COMPILER_DEFINES += __GNUC__ WIN32 QMAKE_EXT_OBJ = .o diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf index bf8d15b..6909b3b 100644 --- a/mkspecs/win32-g++/qmake.conf +++ b/mkspecs/win32-g++/qmake.conf @@ -16,7 +16,7 @@ equals(QMAKE_HOST.os, Windows): EXE_SUFFIX = .exe TEMPLATE = app CONFIG += qt warn_on release link_prl copy_dir_files debug_and_release debug_and_release_target precompile_header QT += core gui -DEFINES += UNICODE QT_LARGEFILE_SUPPORT +DEFINES += UNICODE QMAKE_COMPILER_DEFINES += __GNUC__ WIN32 QMAKE_EXT_OBJ = .o diff --git a/mkspecs/win32-icc/qmake.conf b/mkspecs/win32-icc/qmake.conf index 002a165..47deaeb 100644 --- a/mkspecs/win32-icc/qmake.conf +++ b/mkspecs/win32-icc/qmake.conf @@ -8,7 +8,7 @@ MAKEFILE_GENERATOR = MSVC.NET TEMPLATE = app CONFIG += qt warn_on release incremental flat link_prl copy_dir_files debug_and_release debug_and_release_target QT += core gui -DEFINES += UNICODE QT_LARGEFILE_SUPPORT +DEFINES += UNICODE QMAKE_COMPILER_DEFINES += __INTEL_COMPILER WIN32 QMAKE_CC = icl diff --git a/mkspecs/win32-msvc2003/qmake.conf b/mkspecs/win32-msvc2003/qmake.conf index a573a4d..660aa60 100644 --- a/mkspecs/win32-msvc2003/qmake.conf +++ b/mkspecs/win32-msvc2003/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 QT += core gui -DEFINES += UNICODE WIN32 QT_LARGEFILE_SUPPORT +DEFINES += UNICODE WIN32 QMAKE_COMPILER_DEFINES += _MSC_VER=1310 WIN32 QMAKE_CC = cl diff --git a/mkspecs/win32-msvc2005/qmake.conf b/mkspecs/win32-msvc2005/qmake.conf index 5b717e7..df718ca 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 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..5c31cda 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 QMAKE_COMPILER_DEFINES += _MSC_VER=1500 WIN32 QMAKE_CC = cl diff --git a/mkspecs/win32-msvc2010/qmake.conf b/mkspecs/win32-msvc2010/qmake.conf index 1cad99e..9e5711c 100644 --- a/mkspecs/win32-msvc2010/qmake.conf +++ b/mkspecs/win32-msvc2010/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=1600 WIN32 QMAKE_CC = cl 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 |