summaryrefslogtreecommitdiffstats
path: root/doc/src/frameworks-technologies
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-08-10 06:43:20 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-08-10 06:43:20 (GMT)
commit834907be1ebea35ac933ef2fe48658b983057820 (patch)
tree280853036b7c5cac36760fa20047f92f31587b37 /doc/src/frameworks-technologies
parent4b029b2882d9dd59893807b2db72efc43792aafd (diff)
parentf3ac9de816c0bff9961110c5a734871da2e129cf (diff)
downloadQt-834907be1ebea35ac933ef2fe48658b983057820.zip
Qt-834907be1ebea35ac933ef2fe48658b983057820.tar.gz
Qt-834907be1ebea35ac933ef2fe48658b983057820.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (26 commits) Correct spelling (UNKOWN -> UNKNOWN) to fix recent test regression add performance comparisons to qregexp benchmark configure: fix error message when calling config.status Fix invalid memory write during recursive timer activation Added comment about calendarPopup in setCalendarWidget function documentation. doc: Fixed some qdoc errors. Correcting spelling mistakes in documentation. Part of fix for QTBUG-11938. CreateFileMapping returns NULL on error , only tested with INVALID_HANDLE_VALUE. XmlListModel doc fixes Mention QML_IMPORT_TRACE in Modules docs Merge sections about when property and default state Explain Flipable example further PathView required some diagonal movement before a drag was initiated. doc: Fixed some qdoc errors. doc: Fixed some qdoc errors. OpenGL: Fix multisample renderbuffer creation when MAX_SAMPLES is 0. doc: Fixed some qdoc errors. Add Ukrainian translation. doc: Fixed some qdoc errors. doc: Fixed some qdoc errors. ...
Diffstat (limited to 'doc/src/frameworks-technologies')
-rw-r--r--doc/src/frameworks-technologies/dnd.qdoc1
1 files changed, 0 insertions, 1 deletions
diff --git a/doc/src/frameworks-technologies/dnd.qdoc b/doc/src/frameworks-technologies/dnd.qdoc
index c5dd27c..ebfa39e 100644
--- a/doc/src/frameworks-technologies/dnd.qdoc
+++ b/doc/src/frameworks-technologies/dnd.qdoc
@@ -30,7 +30,6 @@
\title Drag and Drop
\brief An overview of the drag and drop system provided by Qt.
- \ingroup technology-apis
\ingroup qt-gui-concepts
Drag and drop provides a simple visual mechanism which users can use