summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/code
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-08-11 09:12:42 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-08-11 09:12:42 (GMT)
commitef0d191e3d138f695a39128b6040d0884821f5b5 (patch)
tree7da6eae795f07d631a33940e7481f38c40444e28 /doc/src/snippets/code
parentd181197c41be617fbc2243d376e20f4a95b944f7 (diff)
parent1023209b9c335d72dc489d67e632d80cadac924d (diff)
downloadQt-ef0d191e3d138f695a39128b6040d0884821f5b5.zip
Qt-ef0d191e3d138f695a39128b6040d0884821f5b5.tar.gz
Qt-ef0d191e3d138f695a39128b6040d0884821f5b5.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix build os QSharedPointer on MSVC Fix for QTBUG-2182: "connection still in use" warnings. Replace gluOrtho2d with glOrtho. Optimize QSharedPointer::operator=(const QSharedPointer &) Make selection work across ligatures Fix compilation on 64-bit Windows. Fix documentation for QAccessible::InterfaceFactory Replace gluPerspective with qgluPerspective. Remove dependency of OpenGL Utility Library (GLU).
Diffstat (limited to 'doc/src/snippets/code')
-rw-r--r--doc/src/snippets/code/src_gui_accessible_qaccessible.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/src/snippets/code/src_gui_accessible_qaccessible.cpp b/doc/src/snippets/code/src_gui_accessible_qaccessible.cpp
index 8434d81..c5ca441 100644
--- a/doc/src/snippets/code/src_gui_accessible_qaccessible.cpp
+++ b/doc/src/snippets/code/src_gui_accessible_qaccessible.cpp
@@ -46,3 +46,7 @@ if (child) {
delete child;
}
//! [0]
+
+//! [1]
+typedef QAccessibleInterface* myFactoryFunction(const QString &key, QObject *);
+//! [1] \ No newline at end of file