From 954c2f4cf1466ac7a8d9be2ea20dc0e4aeb53c7a Mon Sep 17 00:00:00 2001 From: Andreas Holzammer Date: Thu, 10 May 2012 14:37:57 +0200 Subject: [PATCH] Add more descriptions for configure for Windows Add some more of the prefix options that are already implemented to the usage information. Change-Id: I89ee37ebc6deee8b6a5fd5a1c16d26ae3ead1f30 Reviewed-by: Oswald Buddenhagen --- tools/configure/configureapp.cpp | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index d3084e19a7..ae8e4b749e 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1469,6 +1469,29 @@ bool Configure::displayHelp() desc("Installation options:\n\n"); + desc("These are optional, but you may specify install directories.\n\n", 0, 1); + + desc( "-prefix ", "This will install everything relative to (default $QT_INSTALL_PREFIX)\n\n"); + + desc( "-hostprefix [dir]", "Tools and libraries needed when developing applications are installed in [dir]. " + "If [dir] is not given, the current build directory will be used. (default PREFIX)\n"); + + desc("You may use these to separate different parts of the install:\n\n"); + + desc( "-bindir ", "Executables will be installed to (default PREFIX/bin)"); + desc( "-libdir ", "Libraries will be installed to (default PREFIX/lib)"); + desc( "-docdir ", "Documentation will be installed to (default PREFIX/doc)"); + desc( "-headerdir ", "Headers will be installed to (default PREFIX/include)"); + desc( "-plugindir ", "Plugins will be installed to (default PREFIX/plugins)"); + desc( "-importdir ", "Imports for QML will be installed to (default PREFIX/imports)"); + desc( "-datadir ", "Data used by Qt programs will be installed to (default PREFIX)"); + desc( "-translationdir ", "Translations of Qt programs will be installed to (default PREFIX/translations)"); + desc( "-examplesdir ", "Examples will be installed to (default PREFIX/examples)"); + desc( "-testsdir ", "Tests will be installed to (default PREFIX/tests)"); + + desc( "-hostbindir ", "Host executables will be installed to (default HOSTPREFIX/bin)"); + desc( "-hostdatadir ", "Data used by qmake will be installed to (default HOSTPREFIX)"); + #if !defined(EVAL) desc("Configure options:\n\n"); @@ -1540,6 +1563,7 @@ bool Configure::displayHelp() desc( "-platform ", "The operating system and compiler you are building on.\n(default %QMAKESPEC%)\n"); desc( "-xplatform ", "The operating system and compiler you are cross compiling to.\n"); desc( "", "See the README file for a list of supported operating systems and compilers.\n", false, ' '); + desc( "-sysroot ", "Sets as the target compiler's and qmake's sysroot."); #if !defined(EVAL) desc( "-qtnamespace ", "Wraps all Qt library code in 'namespace name {...}");