diff options
author | Sze Howe Koh <szehowe.koh@gmail.com> | 2012-12-29 02:09:39 +0800 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-25 17:27:44 +0100 |
commit | 63569a68d2fd5ca90c4660e632fba2f3f3b37d73 (patch) | |
tree | 135a8c850a6c8067a6c7a47de2c08579d8d168b4 /configure | |
parent | e3ac2b6392bfd1449f94393804fe7f4b4207b5a7 (diff) | |
download | qtbase-63569a68d2fd5ca90c4660e632fba2f3f3b37d73.tar.gz qtbase-63569a68d2fd5ca90c4660e632fba2f3f3b37d73.tar.bz2 qtbase-63569a68d2fd5ca90c4660e632fba2f3f3b37d73.zip |
Doc: Fix module name format
Follow the conventions at
http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation
QtCore -> Qt Core
QtDBus -> Qt D-Bus
QtDesigner -> Qt Designer
QtGui -> Qt GUI
QtImageFormats -> Qt Image Formats
QtNetwork -> Qt Network
QtPrintSupport -> Qt Print Support
QtScript -> Qt Script
QtSql -> Qt SQL
QtSvg -> Qt SVG
QtTest -> Qt Test
QtWebKit -> Qt WebKit
QtWidgets -> Qt Widgets
QtXml -> Qt XML
QtConcurrent -> Qt Concurrent (partial)
QtQuick -> Qt Quick (partial)
Also, distinguish between "module" and "library"
Change-Id: Icb8aa695ae60b0e45920b0c8fce4dc763a12b0cd
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 32 |
1 files changed, 16 insertions, 16 deletions
@@ -3101,7 +3101,7 @@ Configure options: + -accessibility ..... Compile Accessibility support. -no-sql-<driver> ... Disable SQL <driver> entirely. - -qt-sql-<driver> ... Enable a SQL <driver> in the QtSql library, by default + -qt-sql-<driver> ... Enable a SQL <driver> in the Qt SQL module, by default none are turned on. -plugin-sql-<driver> Enable SQL <driver> as a plugin to be linked to at run time. @@ -3187,11 +3187,11 @@ Additional options: ($QT_DEFAULT_BUILD_PARTS) -nomake <part> ..... Exclude part from the list of parts to be built. - -no-gui ............ Don't build the QtGui library and dependencies. - + -gui ............... Build the QtGui library and dependencies. + -no-gui ............ Don't build the Qt GUI module and dependencies. + + -gui ............... Build the Qt GUI module and dependencies. - -no-widgets ........ Don't build the QtWidgets library and dependencies. - + -widgets ........... Build the QtWidgets library and dependencies. + -no-widgets ........ Don't build the Qt Widgets module and dependencies. + + -widgets ........... Build the Qt Widgets module and dependencies. -R <string> ........ Add an explicit runtime library path to the Qt libraries. @@ -3233,9 +3233,9 @@ Additional options: $PHN -no-pch ............ Do not use precompiled header support. $PHY -pch ............... Use precompiled header support. - $DBN -no-dbus ........... Do not compile the QtDBus module. - $DBY -dbus .............. Compile the QtDBus module and dynamically load libdbus-1. - -dbus-linked ....... Compile the QtDBus module and link to libdbus-1. + $DBN -no-dbus ........... Do not compile the Qt D-Bus module. + $DBY -dbus .............. Compile the Qt D-Bus module and dynamically load libdbus-1. + -dbus-linked ....... Compile the Qt D-Bus module and link to libdbus-1. -reduce-relocations ..... Reduce relocations in the libraries through extra linker optimizations (Qt/X11 and Qt for Embedded Linux only; @@ -4436,7 +4436,7 @@ if [ "$CFG_DBUS" != "no" ]; then elif [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then # CFG_DBUS is "yes" or "linked" here - echo "The QtDBus module cannot be enabled because libdbus-1 version $MIN_DBUS_1_VERSION was not found." + echo "The Qt D-Bus module cannot be enabled because libdbus-1 version $MIN_DBUS_1_VERSION was not found." echo " Turn on verbose messaging (-v) to $0 to see the final report." echo " If you believe this message is in error you may use the continue" echo " switch (-continue) to $0 to continue." @@ -5655,7 +5655,7 @@ EOF esac if [ "$CFG_GUI" = "no" ]; then - # WebKit requires QtGui + # WebKit requires Qt GUI canBuildWebKit="no" fi @@ -6193,12 +6193,12 @@ if [ -n "$PKG_CONFIG" ]; then else echo "pkg-config ............. no" fi -[ "$CFG_DBUS" = "no" ] && echo "QtDBus module .......... no" -[ "$CFG_DBUS" = "yes" ] && echo "QtDBus module .......... yes (run-time)" -[ "$CFG_DBUS" = "linked" ] && echo "QtDBus module .......... yes (linked)" -echo "QtConcurrent code ...... $CFG_CONCURRENT" -echo "QtGui module ........... $CFG_GUI" -echo "QtWidgets module ....... $CFG_WIDGETS" +[ "$CFG_DBUS" = "no" ] && echo "Qt D-Bus module ........ no" +[ "$CFG_DBUS" = "yes" ] && echo "Qt D-Bus module ........ yes (run-time)" +[ "$CFG_DBUS" = "linked" ] && echo "Qt D-Bus module ........ yes (linked)" +echo "Qt Concurrent code ..... $CFG_CONCURRENT" +echo "Qt GUI module .......... $CFG_GUI" +echo "Qt Widgets module ...... $CFG_WIDGETS" if [ "$CFG_JAVASCRIPTCORE_JIT" = "auto" ]; then echo "JavaScriptCore JIT ..... To be decided by JavaScriptCore" else |