summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Ritt <ritt.ks@gmail.com>2012-06-21 23:33:07 +0300
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-04-24 15:38:55 +0200
commit2bba0eadc1570f29331285738b9d319687f84d4c (patch)
treeebf1e6a2803fad12720b92cf374c7ca35ca31b81
parent6df3a1e606490c8f070949f5b3cf790f62a0742a (diff)
downloadqt4-tools-2bba0eadc1570f29331285738b9d319687f84d4c.tar.gz
Avoid macro re-definition after 65bd0bd1f047f6db6d67a8f089a9a409354b95a1
based on qt5/qtbase: a9ba92740670ddbbcb0c68f80ad1a18cf2ff0598 Change-Id: Ie036d502950f5e3c0b0297d480af6cfd351e3db0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat
-rwxr-xr-xconfigure.exebin1433600 -> 1459200 bytes
-rw-r--r--dist/changes-4.8.52
-rw-r--r--mkspecs/unsupported/win32-g++-cross/qmake.conf2
-rw-r--r--mkspecs/win32-g++/qmake.conf2
-rw-r--r--mkspecs/win32-icc/qmake.conf2
-rw-r--r--mkspecs/win32-msvc2003/qmake.conf2
-rw-r--r--mkspecs/win32-msvc2005/qmake.conf2
-rw-r--r--mkspecs/win32-msvc2008/qmake.conf2
-rw-r--r--mkspecs/win32-msvc2010/qmake.conf2
-rw-r--r--mkspecs/win32-msvc2012/qmake.conf2
-rw-r--r--tools/configure/configureapp.cpp2
11 files changed, 11 insertions, 9 deletions
diff --git a/configure.exe b/configure.exe
index 9f57673ed3..94b822ec58 100755
--- a/configure.exe
+++ b/configure.exe
Binary files differ
diff --git a/dist/changes-4.8.5 b/dist/changes-4.8.5
index dd533db319..e5fa2b895b 100644
--- a/dist/changes-4.8.5
+++ b/dist/changes-4.8.5
@@ -62,6 +62,8 @@ Qt for Linux/X11
Qt for Windows
--------------
+- Fix configure.exe wrongly claiming Large File Support as disabled
+
Qt for Mac OS X
---------------
diff --git a/mkspecs/unsupported/win32-g++-cross/qmake.conf b/mkspecs/unsupported/win32-g++-cross/qmake.conf
index bfd9899fb9..f8f9886faa 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 bf8d15b293..6909b3b8a0 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 002a16530a..47deaebae1 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 a573a4dd8c..660aa60fae 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 5b717e749f..df718ca4f8 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 c7655626e2..5c31cdad79 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 1cad99e337..9e5711cc4e 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 a649604ec0..875978b8b3 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
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 73dc190645..e64d993e66 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -294,7 +294,7 @@ Configure::Configure(int& argc, char** argv)
dictionary[ "QPA" ] = "no";
dictionary[ "NIS" ] = "no";
dictionary[ "NEON" ] = "no";
- dictionary[ "LARGE_FILE" ] = "no";
+ dictionary[ "LARGE_FILE" ] = "yes";
dictionary[ "LITTLE_ENDIAN" ] = "yes";
dictionary[ "FONT_CONFIG" ] = "no";
dictionary[ "POSIX_IPC" ] = "no";
View Lorry Controller Status