diff options
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/dialogs/qabstractprintdialog.cpp | 4 | ||||
| -rw-r--r-- | src/gui/graphicsview/qgraphicsitem.cpp | 6 | ||||
| -rw-r--r-- | src/gui/graphicsview/qgraphicslayout.cpp | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/gui/dialogs/qabstractprintdialog.cpp b/src/gui/dialogs/qabstractprintdialog.cpp index 4b495d1..6c9c61e 100644 --- a/src/gui/dialogs/qabstractprintdialog.cpp +++ b/src/gui/dialogs/qabstractprintdialog.cpp @@ -79,7 +79,7 @@ class QPrintDialogPrivate : public QAbstractPrintDialogPrivate \value AllPages All pages should be printed. \value Selection Only the selection should be printed. \value PageRange The specified page range should be printed. - \value CurrentPage Only the currently visible page should be printed. + \value CurrentPage Only the currently visible page should be printed. (This value was introduced in 4.7.) \sa QPrinter::PrintRange */ @@ -95,7 +95,7 @@ class QPrintDialogPrivate : public QAbstractPrintDialogPrivate \value PrintPageRange The page range selection option is enabled. \value PrintShowPageSize Show the page size + margins page only if this is enabled. \value PrintCollateCopies The collate copies option is enabled - \value PrintCurrentPage The print current page option is enabled + \value PrintCurrentPage The print current page option is enabled (This value was introduced in 4.7.) This value is obsolete and does nothing since Qt 4.5: diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 9e1fd09..abf9d44 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -11050,9 +11050,9 @@ QGraphicsItemGroup::~QGraphicsItemGroup() } /*! - Adds the given \a item to this item group. The item will be - reparented to this group, but its position and transformation - relative to the scene will stay intact. + Adds the given \a item and item's child items to this item group. + The item and child items will be reparented to this group, + but its position and transformation relative to the scene will stay intact. \sa removeFromGroup(), QGraphicsScene::createItemGroup() */ diff --git a/src/gui/graphicsview/qgraphicslayout.cpp b/src/gui/graphicsview/qgraphicslayout.cpp index f983955..5f0883f 100644 --- a/src/gui/graphicsview/qgraphicslayout.cpp +++ b/src/gui/graphicsview/qgraphicslayout.cpp @@ -102,6 +102,10 @@ QT_BEGIN_NAMESPACE any way, but for a linear layout, the order is essential. When writing your own layout subclass, you are free to choose the API that best suits your layout. + For adding layout items to the custom layout, the QGraphicsLayout provides + convenience function addChildLayoutItem(). The function will take care of + automatically reparenting graphics items, if needed. + \section1 Activating the Layout When the layout's geometry changes, QGraphicsLayout immediately rearranges |