summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@theqtcompany.com>2016-03-18 22:18:10 +0100
committerLars Knoll <lars.knoll@theqtcompany.com>2016-04-07 16:17:43 +0000
commit84d3a21c9efe7efb2cce6d3bd14af1f9580b1108 (patch)
treee2b44f15b4be3c868830a183ef7b8031945fb237
parent5f136bccd80d44eaca8928c9307a5dd25b33bf6d (diff)
Remove support for -no-largefile
It's 2016, and file sizes larger than 4G are common, so -no-largefile is something we really shouldn't support anymore. For now left the implementation as is, just removed the configurability from the command line. But this should really get replaced by decent configure checks that check for 64bit stat() vs stat64() vs 32bit stat(). Change-Id: I057515e3cc1f06a022d80f02e866944428026b1d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
-rwxr-xr-xconfigure23
-rw-r--r--tools/configure/configureapp.cpp7
2 files changed, 1 insertions, 29 deletions
diff --git a/configure b/configure
index 9f7ceba3c4..2e24d592eb 100755
--- a/configure
+++ b/configure
@@ -699,7 +699,7 @@ CFG_ICONV=auto
CFG_DBUS=auto
CFG_GLIB=auto
CFG_GTK=auto
-CFG_LARGEFILE=auto
+CFG_LARGEFILE=yes
CFG_OPENSSL=auto
CFG_LIBPROXY=auto
CFG_SECURETRANSPORT=auto
@@ -1959,13 +1959,6 @@ while [ "$#" -gt 0 ]; do
UNKNOWN_OPT=yes
fi
;;
- largefile)
- if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
- CFG_LARGEFILE="$VAL"
- else
- UNKNOWN_OPT=yes
- fi
- ;;
openssl)
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
CFG_OPENSSL="$VAL"
@@ -2335,9 +2328,6 @@ Configure options:
* -shared ............ Create and use shared Qt libraries.
-static ............ Create and use static Qt libraries.
- -no-largefile ...... Disables large file support.
- + -largefile ......... Enables Qt to access files larger than 4 GB.
-
-no-accessibility .. Do not compile Accessibility support.
Disabling accessibility is not recommended, as it will break QStyle
and may break other internal parts of Qt.
@@ -4619,11 +4609,6 @@ if [ "$CFG_SYSLOG" != "no" ]; then
fi
fi
-if [ "$CFG_LARGEFILE" = "auto" ]; then
- #Large files should be enabled for all Linux systems
- CFG_LARGEFILE=yes
-fi
-
if [ "$CFG_GUI" = "no" ]; then
QPA_PLATFORM_GUARD=no
fi
@@ -6063,11 +6048,6 @@ elif [ "$CFG_GSTREAMER" = "1.0" ]; then
fi
fi
-if [ "$CFG_LARGEFILE" != "yes" ] && [ "$XPLATFORM_MINGW" = "yes" ]; then
- echo "Warning: largefile support cannot be disabled for win32."
- CFG_LARGEFILE="yes"
-fi
-
#-------------------------------------------------------------------------------
# ask for all that hasn't been auto-detected or specified in the arguments
#-------------------------------------------------------------------------------
@@ -6998,7 +6978,6 @@ report_support " Qt D-Bus ..............." "$CFG_DBUS" runtime "loading dbus-1
report_support " Qt Concurrent .........." "$CFG_CONCURRENT"
report_support " Qt GUI ................." "$CFG_GUI"
report_support " Qt Widgets ............." "$CFG_WIDGETS"
-report_support " Large File ............." "$CFG_LARGEFILE"
report_support " QML debugging .........." "$CFG_QML_DEBUG"
report_support " Use system proxies ....." "$CFG_SYSTEM_PROXIES"
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index b3df3cceaf..d5c47357fa 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -1225,10 +1225,6 @@ void Configure::parseCmdLine()
dictionary["QT_INOTIFY"] = "no";
}
- else if (configCmdLine.at(i) == "-largefile") {
- dictionary["LARGE_FILE"] = "yes";
- }
-
else if (configCmdLine.at(i) == "-fontconfig") {
dictionary["FONT_CONFIG"] = "yes";
} else if (configCmdLine.at(i) == "-no-fontconfig") {
@@ -1776,8 +1772,6 @@ bool Configure::displayHelp()
desc("QT_EVENTFD", "yes", "-eventfd", "Enable eventfd(7) support in the UNIX event loop.");
desc("QT_EVENTFD", "no", "-no-eventfd", "Disable eventfd(7) support in the UNIX event loop.\n");
- desc("LARGE_FILE", "yes", "-largefile", "Enables Qt to access files larger than 4 GB.\n");
-
desc("POSIX_IPC", "yes", "-posix-ipc", "Enable POSIX IPC.\n");
desc("QT_GLIB", "yes", "-glib", "Compile Glib support.\n");
@@ -3630,7 +3624,6 @@ void Configure::displayConfig()
<< (dictionary[ "AVX512" ].isEmpty() ? QString("<none>") : dictionary[ "AVX512" ].toUpper()) << endl;
sout << "NEON support................" << dictionary[ "NEON" ] << endl;
sout << "OpenGL support.............." << dictionary[ "OPENGL" ] << endl;
- sout << "Large File support.........." << dictionary[ "LARGE_FILE" ] << endl;
sout << "NIS support................." << dictionary[ "NIS" ] << endl;
sout << "Iconv support..............." << dictionary[ "QT_ICONV" ] << endl;
sout << "Evdev support..............." << dictionary[ "QT_EVDEV" ] << endl;