From 7509ccc0f7020a313fcd04447ab3f9b8ff1a548d Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 8 Feb 2017 18:46:21 +0100 Subject: add configure -list-features also actually deletes qfeatures.txt, which was already claimed by a668c6a6, but not actually done. Task-number: QTBUG-58411 Change-Id: I686760632fee7c10b01bd2e83f2481b01bc2b774 Reviewed-by: Lars Knoll --- config_help.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'config_help.txt') diff --git a/config_help.txt b/config_help.txt index 5ebeaf5af3..32bc15412c 100644 --- a/config_help.txt +++ b/config_help.txt @@ -62,6 +62,11 @@ Configure meta: Use this after installing missing dependencies. -recheck-all ......... Discard all cached configure test results. + -feature- ... Enable + -no-feature- Disable [none] + -list-features ....... List available features. Note that some features + have dedicated command line options as well. + Build options: -opensource .......... Build the Open-Source Edition of Qt @@ -182,8 +187,6 @@ Component selection: -dbus-linked ......... Build Qt D-Bus and link to libdbus-1 [auto] -dbus-runtime ........ Build Qt D-Bus and dynamically load libdbus-1 [no] DBUS_PATH= DBUS_HOST_PATH= - -feature- ... Enable . The available features are described - in src/corelib/global/qfeatures.txt. [all enabled] -accessibility ....... Enable accessibility support [yes] Note: Disabling accessibility is not recommended. -qml-debug ........... Enable QML debugging support [yes] -- cgit v1.2.3 From 5f209542916065775cdd23415aee4a7dee98e902 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 8 Feb 2017 19:38:31 +0100 Subject: add configure -list-libraries currently mostly for debugging purposes (especially with -verbose). Change-Id: I8af32c61df0b19861aa79bc4bbdd3f6095dbe9b7 Reviewed-by: Lars Knoll --- config_help.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'config_help.txt') diff --git a/config_help.txt b/config_help.txt index 32bc15412c..8a9db24fae 100644 --- a/config_help.txt +++ b/config_help.txt @@ -67,6 +67,8 @@ Configure meta: -list-features ....... List available features. Note that some features have dedicated command line options as well. + -list-libraries ...... List possible external dependencies. + Build options: -opensource .......... Build the Open-Source Edition of Qt -- cgit v1.2.3 From aa88fe8417eb78944b48b5855024e558b4a0f0a5 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 8 Feb 2017 20:39:04 +0100 Subject: don't make false promises about configure FOO=bar assignments they don't actually override values from pkg-config. Change-Id: I00bc7f4bcbfb4e036cb1ac9fa842d68523f54605 Reviewed-by: Lars Knoll --- config_help.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'config_help.txt') diff --git a/config_help.txt b/config_help.txt index 8a9db24fae..fb3b2225c6 100644 --- a/config_help.txt +++ b/config_help.txt @@ -1,8 +1,7 @@ Usage: configure [options] [assignments] Configure understands variable assignments like VAR=value on the command line. -These override any values possibly obtained from pkg-config. The variables -are mentioned in the descriptions of the options they relate to. +The variables are mentioned in the descriptions of the options they relate to. It is also possible to manipulate any QMAKE_* variable, to amend the values from the mkspec for the build of Qt itself, e.g., QMAKE_CXXFLAGS+=-g3. -- cgit v1.2.3 From 59a3abd1f1429eef19e178e880070c3c1d902fba Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 8 Feb 2017 21:22:08 +0100 Subject: configure: generalize command line overrides of library parameters the outdated ones remain for backwards compatibility; some remain unchanged. Task-number: QTBUG-30083 Change-Id: Ia596b854d26b00fcb4f48df0da7ad893650ac1c8 Reviewed-by: Lars Knoll --- config_help.txt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'config_help.txt') diff --git a/config_help.txt b/config_help.txt index fb3b2225c6..f48b9eaed4 100644 --- a/config_help.txt +++ b/config_help.txt @@ -1,7 +1,10 @@ Usage: configure [options] [assignments] Configure understands variable assignments like VAR=value on the command line. -The variables are mentioned in the descriptions of the options they relate to. +Each uppercased library name (obtainable with -list-libraries) supports the +suffixes _INCDIR, _LIBDIR, _PREFIX (INCDIR=PREFIX/include, LIBDIR=PREFIX/lib), +_LIBS, and - on Windows and Darwin - _LIBS_DEBUG and _LIBS_RELEASE. E.g., +ICU_PREFIX=/opt/icu42 ICU_LIBS="-licui18n -licuuc -licudata". It is also possible to manipulate any QMAKE_* variable, to amend the values from the mkspec for the build of Qt itself, e.g., QMAKE_CXXFLAGS+=-g3. @@ -187,7 +190,6 @@ Component selection: [default on Android and Windows] -dbus-linked ......... Build Qt D-Bus and link to libdbus-1 [auto] -dbus-runtime ........ Build Qt D-Bus and dynamically load libdbus-1 [no] - DBUS_PATH= DBUS_HOST_PATH= -accessibility ....... Enable accessibility support [yes] Note: Disabling accessibility is not recommended. -qml-debug ........... Enable QML debugging support [yes] @@ -207,7 +209,6 @@ Core options: -pps ................. Enable PPS support [auto] (QNX only) -pcre ................ Select used libpcre3 [system/qt] -zlib ................ Select used zlib [system/qt] - ZLIB_LIBS= Logging backends: -journald .......... Enable journald support [no] (Unix only) @@ -220,8 +221,6 @@ Network options: -no-openssl .......... Do not use OpenSSL [default on Apple and WinRT] -openssl-linked ...... Use OpenSSL and link to libssl [no] -openssl-runtime ..... Use OpenSSL and dynamically load libssl [auto] - OPENSSL_PATH= OPENSSL_LIBS=, and on Windows also - OPENSSL_LIBS_DEBUG= OPENSSL_LIBS_RELEASE= -securetransport ..... Use SecureTransport [auto] (Apple only) -sctp ................ Enable SCTP support [no] @@ -289,5 +288,4 @@ Database options: -sql- ........ Enable SQL plugin. Supported drivers: db2 ibase mysql oci odbc psql sqlite2 sqlite tds [all auto] - MYSQL_PATH= PSQL_LIBS= SYBASE= SYBASE_LIBS= -sqlite .............. Select used sqlite3 [system/qt] -- cgit v1.2.3