Merge remote-tracking branch 'origin/3.3' into 3.4

Conflicts:
	doc/api/coding-style.qdoc

Change-Id: Id40eb253a2e3e2357276ee76085127da10597bdb
This commit is contained in:
Eike Ziller
2015-02-25 10:15:28 +01:00
15 changed files with 79 additions and 26 deletions

View File

@@ -891,7 +891,7 @@
for signals and slots inside connect statements to safely make
signal and slot lookup a few cycles faster. You can use
$QTDIR/util/normalize to normalize existing code. For more
information, see \l{http://qt-project.org/doc/qt-4.8/qmetaobject.html#normalizedSignature}{QMetaObject::normalizedSignature}.
information, see QMetaObject::normalizedSignature.
\endlist
\section2 File Headers