path: root/src/corelib/global
diff options
authorFrederik Gladhorn <>2013-02-13 11:58:07 +0100
committerFrederik Gladhorn <>2013-02-14 14:24:57 +0100
commite65cd6f3794e12e6bc5c2ee985eae8e70ff5f333 (patch)
tree8965835c375422d63b2ccfa927b31a56e64bda1d /src/corelib/global
parentd1ee7189553e13337b198fe4ba66d79fb7a7f41d (diff)
parente95a758236cf2c68e33da4ddb62bff4fe8d9dd8b (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 'src/corelib/global')
1 files changed, 6 insertions, 6 deletions
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index b271620ee0..1f1ff36442 100644
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@@ -523,11 +523,11 @@
application to deadlock.
\value UniqueConnection
- Same as AutoConnection, but the connection is made only if
- it does not duplicate an existing connection. i.e., if the
- same signal is already connected to the same slot for the
- same pair of objects, then the connection will fail. This
- connection type was introduced in Qt 4.6.
+ This is a flag that can be combined with any one of the above
+ connection types, using a bitwise OR. When Qt::UniqueConnection is
+ set, QObject::connect() will fail if the connection already exists
+ (i.e. if the same signal is already connected to the same slot
+ for the same pair of objects). This flag was introduced in Qt 4.6.
With queued connections, the parameters must be of types that are
known to Qt's meta-object system, because Qt needs to copy the
@@ -2493,7 +2493,7 @@
whereas Qt::ElideRight is appropriate
for other strings (e.g.,
- "\l{}{Deploying Applications on Ma...}").
+ "\l{}{Deploying Applications on Ma...}").
\sa QAbstractItemView::textElideMode, QFontMetrics::elidedText(), AlignmentFlag, QTabBar::elideMode