diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-13 11:58:07 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-14 14:24:57 +0100 |
commit | e65cd6f3794e12e6bc5c2ee985eae8e70ff5f333 (patch) | |
tree | 8965835c375422d63b2ccfa927b31a56e64bda1d /tests/auto/tools | |
parent | d1ee7189553e13337b198fe4ba66d79fb7a7f41d (diff) | |
parent | e95a758236cf2c68e33da4ddb62bff4fe8d9dd8b (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/concurrent/doc/qtconcurrent.qdocconf
src/corelib/doc/qtcore.qdocconf
src/corelib/global/qglobal.h
src/dbus/doc/qtdbus.qdocconf
src/dbus/qdbusmessage.h
src/gui/doc/qtgui.qdocconf
src/gui/image/qimagereader.cpp
src/network/doc/qtnetwork.qdocconf
src/opengl/doc/qtopengl.qdocconf
src/opengl/qgl.h
src/plugins/platforms/windows/qwindowswindow.cpp
src/printsupport/doc/qtprintsupport.qdocconf
src/sql/doc/qtsql.qdocconf
src/testlib/doc/qttestlib.qdocconf
src/tools/qdoc/doc/config/qt-cpp-ignore.qdocconf
src/widgets/doc/qtwidgets.qdocconf
src/xml/doc/qtxml.qdocconf
Change-Id: Ie9a1fa2cc44bec22a0b942e817a1095ca3414629
Diffstat (limited to 'tests/auto/tools')
-rw-r--r-- | tests/auto/tools/uic/baseline/chatmainwindow.ui | 2 | ||||
-rw-r--r-- | tests/auto/tools/uic/baseline/chatmainwindow.ui.h | 2 |
2 files changed, 2 insertions, 2 deletions
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)); |