summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xconfigure27
-rw-r--r--tools/configure/configureapp.cpp31
2 files changed, 2 insertions, 56 deletions
diff --git a/configure b/configure
index e93a523152..7cb110b459 100755
--- a/configure
+++ b/configure
@@ -2918,32 +2918,7 @@ if [ "$OPT_HELP" = "yes" ]; then
fi
cat <<EOF
-Usage: $relconf [-h] [-prefix <dir>] [-prefix-install] [-bindir <dir>] [-libdir <dir>]
- [-docdir <dir>] [-headerdir <dir>] [-plugindir <dir> ] [-importdir <dir>] [-datadir <dir>]
- [-translationdir <dir>] [-sysconfdir <dir>] [-examplesdir <dir>] [-testsdir <dir>]
- [-release] [-debug] [-debug-and-release] [-c++11] [-no-c++11]
- [-developer-build] [-shared] [-static] [-no-fast] [-fast] [-no-largefile]
- [-largefile] [-no-accessibility] [-accessibility] [-no-sql-<driver>] [-sql-<driver>]
- [-plugin-sql-<driver>] [-system-sqlite]
- [-platform] [-D <string>] [-I <string>] [-L <string>] [-help]
- [-qt-zlib] [-system-zlib] [-no-gif] [-no-libpng] [-qt-libpng] [-system-libpng]
- [-no-libjpeg] [-qt-libjpeg] [-system-libjpeg] [-make <part>]
- [-nomake <part>] [-R <string>] [-l <string>] [-no-rpath] [-rpath] [-continue]
- [-verbose] [-v] [-silent] [-no-nis] [-nis] [-no-cups] [-cups] [-no-iconv]
- [-iconv] [-no-pch] [-pch] [-no-dbus] [-dbus] [-dbus-linked] [-no-gui]
- [-no-separate-debug-info] [-no-sse2]
- [-no-sse3] [-no-ssse3] [-no-sse4.1] [-no-sse4.2] [-no-avx] [-no-neon]
- [-qtnamespace <namespace>] [-qtlibinfix <infix>] [-separate-debug-info]
- [-no-phonon-backend] [-phonon-backend] [-no-media-backend] [-media-backend]
- [-no-audio-backend] [-audio-backend]
- [-no-javascript-jit] [-javascript-jit] [-no-qml-debug] [-qml-debug]
- [-no-optimized-qmake] [-optimized-qmake]
- [-no-openssl] [-openssl] [-openssl-linked]
- [-no-gtkstyle] [-gtkstyle]
- [-qt-pcre] [-system-pcre]
- [-device <name>] [-device-option <key=value>]
- [additional platform specific options (see below)]
-
+Usage: $relconf [options]
Installation options:
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 3f92a91e94..e4feb22b4c 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -1571,36 +1571,7 @@ QString Configure::locateFile(const QString &fileName)
bool Configure::displayHelp()
{
if (dictionary[ "HELP" ] == "yes") {
- desc("Usage: configure\n"
- "[-release] [-debug] [-debug-and-release] [-shared] [-static]\n"
- "[-no-fast] [-fast] \n"
- "[-no-accessibility] [-accessibility] [-no-rtti] [-rtti]\n"
- "[-no-sql-<driver>] [-qt-sql-<driver>]\n"
- "[-plugin-sql-<driver>] [-system-sqlite]\n"
- "[-D <define>] [-I <includepath>] [-L <librarypath>]\n"
- "[-help] [-no-dsp] [-dsp] [-no-vcproj] [-vcproj]\n"
- "[-no-qmake] [-qmake] [-dont-process] [-process]\n"
- "[-no-style-<style>] [-qt-style-<style>] [-redo]\n"
- "[-saveconfig <config>] [-loadconfig <config>]\n"
- "[-qt-zlib] [-system-zlib] [-qt-pcre] [-system-pcre] [-no-gif]\n"
- "[-no-libpng] [-qt-libpng] [-system-libpng]\n"
- "[-no-libjpeg] [-qt-libjpeg] [-system-libjpeg]\n"
- "[-sse2] [-no-sse2] [-sse3] [-no-sse3]\n"
- "[-ssse3] [-no-ssse3]\n"
- "[-sse4.1] [-no-sse4.1] [-sse4.2] [-no-sse4.2]\n"
- "[-avx] [-no-avx] [-avx2] [-no-avx2]\n"
- "[-no-iwmmxt] [-iwmmxt] [-openssl] [-openssl-linked]\n"
- "[-no-openssl] [-no-dbus] [-dbus] [-dbus-linked] [-platform <spec>]\n"
- "[-qtnamespace <namespace>] [-qtlibinfix <infix>] [-no-phonon]\n"
- "[-phonon] [-no-phonon-backend] [-phonon-backend]\n"
- "[-no-multimedia] [-multimedia] [-no-audio-backend] [-audio-backend]\n"
- "[-no-script] [-script] [-no-scripttools] [-scripttools]\n"
- "[-no-webkit] [-webkit] [-webkit-debug]\n"
- "[-no-directwrite] [-directwrite] [-no-widgets] [-icu]\n"
- "[-no-nis] [-nis] [-no-cups] [-cups] [-no-iconv]\n"
- "[-iconv] [-sun-iconv] [-gnu-iconv] [-neon] [-no-neon]\n"
- "[-largefile] [-font-config] [-no-fontconfig] [-posix-ipc]\n"
- "[-glib] [-sysconfdir <dir>]\n\n", 0, 7);
+ desc("Usage: configure [options]\n\n", 0, 7);
desc("Installation options:\n\n");