summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-04-06 22:41:16 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-04-06 22:41:16 (GMT)
commitf9fce9b432bfcb5c2f48b2b34056a63bd805d8d3 (patch)
tree01cdd02ff5c5c1b2c7dccaabf7addcb940feb7cd /examples
parent3ec5f0c801645cf8beac52f7eab0c97190f9b46d (diff)
parent4409d1b454f02fa1e5e07560a1db6012074172eb (diff)
downloadQt-f9fce9b432bfcb5c2f48b2b34056a63bd805d8d3.zip
Qt-f9fce9b432bfcb5c2f48b2b34056a63bd805d8d3.tar.gz
Qt-f9fce9b432bfcb5c2f48b2b34056a63bd805d8d3.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Fixed the declarative headers and includes within qdoc. Removed invalid public slots section. Minor feature fix led to refactoring for i18n's sake. Fixed string-int concatenation issue. qdoc: Allowed multiple values for certain metadata tags. qdoc: modified \include to take a 2nd arg, snippet id. Doc: Minor fix to title. Doc: Fixed markup. Doc: Added a missing command. Doc: Removed duplicate documentation. Removed some links and prettified others. Doc: Squashed commit of Roland Wolf's threading tutorial.
Diffstat (limited to 'examples')
-rw-r--r--examples/graphicsview/diagramscene/arrow.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/examples/graphicsview/diagramscene/arrow.h b/examples/graphicsview/diagramscene/arrow.h
index 070f74a..cc6ff97 100644
--- a/examples/graphicsview/diagramscene/arrow.h
+++ b/examples/graphicsview/diagramscene/arrow.h
@@ -74,8 +74,6 @@ public:
DiagramItem *endItem() const
{ return myEndItem; }
-
-public slots:
void updatePosition();
protected: