Avoid macro re-definition after 1838a6c2fb5e3b4368c871aa330d028b255b83af

Change-Id: I2631ff687881278ba42edacd237a2130c103b69f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>

diff --git a/mkspecs/unsupported/win32-g++-cross/qmake.conf b/mkspecs/unsupported/win32-g++-cross/qmake.conf
index cc486f7..0b77762 100644 (file)
--- 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/unsupported/win32-msvc2003/qmake.conf b/mkspecs/unsupported/win32-msvc2003/qmake.conf
index 4eb1bb5..7008cb0 100644 (file)
--- a/mkspecs/unsupported/win32-msvc2003/qmake.conf
+++ b/mkspecs/unsupported/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-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
index de50a15..398dba7 100644 (file)
--- a/mkspecs/win32-g++/qmake.conf
+++ b/mkspecs/win32-g++/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-icc/qmake.conf b/mkspecs/win32-icc/qmake.conf
index 58043e4..3e275fa 100644 (file)
--- 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-msvc11/qmake.conf b/mkspecs/win32-msvc11/qmake.conf
index 2f663c6..230ea8f 100644 (file)
--- a/mkspecs/win32-msvc11/qmake.conf
+++ b/mkspecs/win32-msvc11/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

diff --git a/mkspecs/win32-msvc2005/qmake.conf b/mkspecs/win32-msvc2005/qmake.conf
index 01cfe05..bfc481d 100644 (file)
--- 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 904b57a..46cccff 100644 (file)
--- 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 3047146..2327ed8 100644 (file)
--- 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/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index da85691..f38ee50 100644 (file)
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -233,7 +233,7 @@ Configure::Configure(int& argc, char** argv)
     dictionary[ "DIRECTWRITE" ]     = "no";
     dictionary[ "NIS" ]             = "no";
     dictionary[ "NEON" ]            = "no";
-    dictionary[ "LARGE_FILE" ]      = "no";
+    dictionary[ "LARGE_FILE" ]      = "yes";
     dictionary[ "FONT_CONFIG" ]     = "no";
     dictionary[ "POSIX_IPC" ]       = "no";
     dictionary[ "QT_GLIB" ]         = "no";