diff options
author | Sze Howe Koh <szehowe.koh@gmail.com> | 2012-12-29 11:32:44 +0800 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-11 01:43:21 +0100 |
commit | 26817211d27366f4f9d502fd3e4816a1acfc8bba (patch) | |
tree | 9e86d17148368b3bd443678fcf4244502a9a4de9 | |
parent | 5764f1032310065ee2620d5f06e3db75fcaaa2b1 (diff) |
Fix module name format in displayed code
Follow the conventions at
http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation
QtDBus -> Qt D-Bus
QtMultimedia -> Qt Multimedia
QtWidgets -> Qt Widgets
Change-Id: I96a1523b37e294b10b203782074943c6ec55e34a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r-- | examples/dbus/chat/chatmainwindow.ui | 2 | ||||
-rw-r--r-- | tests/auto/tools/uic/baseline/chatmainwindow.ui | 2 | ||||
-rw-r--r-- | tests/auto/tools/uic/baseline/chatmainwindow.ui.h | 2 | ||||
-rw-r--r-- | tools/configure/configureapp.cpp | 10 |
4 files changed, 8 insertions, 8 deletions
diff --git a/examples/dbus/chat/chatmainwindow.ui b/examples/dbus/chat/chatmainwindow.ui index 0616dcb137..537bad5820 100644 --- a/examples/dbus/chat/chatmainwindow.ui +++ b/examples/dbus/chat/chatmainwindow.ui @@ -13,7 +13,7 @@ </rect> </property> <property name="windowTitle" > - <string>QtDBus Chat</string> + <string>Qt D-Bus Chat</string> </property> <widget class="QWidget" name="centralwidget" > <layout class="QHBoxLayout" > diff --git a/tests/auto/tools/uic/baseline/chatmainwindow.ui b/tests/auto/tools/uic/baseline/chatmainwindow.ui index 0616dcb137..537bad5820 100644 --- a/tests/auto/tools/uic/baseline/chatmainwindow.ui +++ b/tests/auto/tools/uic/baseline/chatmainwindow.ui @@ -13,7 +13,7 @@ </rect> </property> <property name="windowTitle" > - <string>QtDBus Chat</string> + <string>Qt D-Bus Chat</string> </property> <widget class="QWidget" name="centralwidget" > <layout class="QHBoxLayout" > diff --git a/tests/auto/tools/uic/baseline/chatmainwindow.ui.h b/tests/auto/tools/uic/baseline/chatmainwindow.ui.h index a2aaeeb333..b3675746bf 100644 --- a/tests/auto/tools/uic/baseline/chatmainwindow.ui.h +++ b/tests/auto/tools/uic/baseline/chatmainwindow.ui.h @@ -149,7 +149,7 @@ public: void retranslateUi(QMainWindow *ChatMainWindow) { - ChatMainWindow->setWindowTitle(QApplication::translate("ChatMainWindow", "QtDBus Chat", 0)); + ChatMainWindow->setWindowTitle(QApplication::translate("ChatMainWindow", "Qt D-Bus Chat", 0)); actionQuit->setText(QApplication::translate("ChatMainWindow", "Quit", 0)); actionQuit->setShortcut(QApplication::translate("ChatMainWindow", "Ctrl+Q", 0)); actionAboutQt->setText(QApplication::translate("ChatMainWindow", "About Qt...", 0)); diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 0212b62017..240859aa14 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1647,7 +1647,7 @@ bool Configure::displayHelp() desc( "", qPrintable(QString(" %1").arg(defaultBuildParts.at(i))), false, ' '); desc( "-nomake <part>", "Exclude part from the list of parts to be built.\n"); - desc("WIDGETS", "no", "-no-widgets", "Disable QtWidgets module.\n"); + desc("WIDGETS", "no", "-no-widgets", "Disable Qt Widgets module.\n"); desc("ACCESSIBILITY", "no", "-no-accessibility", "Disable accessibility support.\n"); desc( "", "Disabling accessibility is not recommended, as it will break QStyle\n" @@ -1809,8 +1809,8 @@ bool Configure::displayHelp() desc("DBUS", "no", "-no-dbus", "Do not compile in D-Bus support."); desc("DBUS", "yes", "-dbus", "Compile in D-Bus support and load libdbus-1\ndynamically."); desc("DBUS", "linked", "-dbus-linked", "Compile in D-Bus support and link to libdbus-1.\n"); - desc("AUDIO_BACKEND", "no","-no-audio-backend", "Do not compile in the platform audio backend into\nQtMultimedia."); - desc("AUDIO_BACKEND", "yes","-audio-backend", "Compile in the platform audio backend into QtMultimedia.\n"); + desc("AUDIO_BACKEND", "no","-no-audio-backend", "Do not compile in the platform audio backend into\nQt Multimedia."); + desc("AUDIO_BACKEND", "yes","-audio-backend", "Compile in the platform audio backend into Qt Multimedia.\n"); desc("QML_DEBUG", "no", "-no-qml-debug", "Do not build the in-process QML debugging support."); desc("QML_DEBUG", "yes", "-qml-debug", "Build the in-process QML debugging support.\n"); desc("DIRECTWRITE", "no", "-no-directwrite", "Do not build support for DirectWrite font rendering."); @@ -3385,8 +3385,8 @@ void Configure::displayConfig() sout << "CUPS support................" << dictionary[ "QT_CUPS" ] << endl; sout << "OpenVG support.............." << dictionary[ "OPENVG" ] << endl; sout << "OpenSSL support............." << dictionary[ "OPENSSL" ] << endl; - sout << "QtDBus support.............." << dictionary[ "DBUS" ] << endl; - sout << "QtWidgets module support...." << dictionary[ "WIDGETS" ] << endl; + sout << "Qt D-Bus support............" << dictionary[ "DBUS" ] << endl; + sout << "Qt Widgets module support..." << dictionary[ "WIDGETS" ] << endl; sout << "QML debugging..............." << dictionary[ "QML_DEBUG" ] << endl; sout << "DirectWrite support........." << dictionary[ "DIRECTWRITE" ] << endl; sout << "Use system proxies.........." << dictionary[ "SYSTEM_PROXIES" ] << endl << endl; |