diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-01 13:57:38 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-01 13:57:38 (GMT) |
| commit | 5067683704580fcfedef4e68f19acedb133936e8 (patch) | |
| tree | 9ed5acfa397b093fd726742ae3c478c2f21223bc /doc/src/snippets/code | |
| parent | 1b4bb02fcb3da77ddfa6281365ba3210aab9daad (diff) | |
| parent | 11d2c8f96697adc93ccd82e3db1de6ecde025eff (diff) | |
| download | Qt-5067683704580fcfedef4e68f19acedb133936e8.zip Qt-5067683704580fcfedef4e68f19acedb133936e8.tar.gz Qt-5067683704580fcfedef4e68f19acedb133936e8.tar.bz2 | |
Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (160 commits)
audiodevices example: no devices available
Assistant: Fix unintended tr context change.
Add QFontMetrics benchmark.
Fixed `make test' for xmlpatternsxqts.
Doc: Put the correct images with the D-Bus and Embedded Linux sections.
Call cheaper clear() instead of assigning new QString()
Fix a regression: icons with slightly wrong ICO header did not load.
Fix some foreach usage to use const refs
Designer: Fix source code scanning issues.
googlesuggest example: Add newline to end of file
Core classes, examples, demos: Some changes from string to char
Fix header labels on mac with rtl
Fixed an endless loop if printing web pages.
doc: Fixed the last qdoc errors.
don't build unneeded QtDesigner parts on Windows CE
doc: Document the "Type" enum value as a const in variable.
Add additional text and painting benchmarks.
Better support for user-generated binary shaders
don't falsely complain about mismatched codecfortr
Fix QSettings default paths not being initialized when setPath() is called
...
Diffstat (limited to 'doc/src/snippets/code')
| -rw-r--r-- | doc/src/snippets/code/doc_src_emb-install.qdoc | 12 | ||||
| -rw-r--r-- | doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp | 11 |
2 files changed, 19 insertions, 4 deletions
diff --git a/doc/src/snippets/code/doc_src_emb-install.qdoc b/doc/src/snippets/code/doc_src_emb-install.qdoc index 60775d2..f24f087 100644 --- a/doc/src/snippets/code/doc_src_emb-install.qdoc +++ b/doc/src/snippets/code/doc_src_emb-install.qdoc @@ -41,18 +41,22 @@ //! [0] cd <anywhere> -gunzip qt-embedded-linux-commercial-src-%VERSION%.tar.gz -tar xf qt-embedded-linux-commercial-src-%VERSION%.tar +gunzip qt-everywhere-opensource-src-%VERSION%.tar.gz +tar xf qt-everywhere-opensource-src-%VERSION%.tar //! [0] //! [1] -~/qt-embedded-linux-commercial-src-%VERSION% +~/qt-everywhere-opensource-src-%VERSION% //! [1] +//! [embedded help] +./configure -embedded -help +//! [embedded help] + //! [2] -cd ~/qt-embedded-linux-commercial-src-%VERSION% +cd ~/qt-everywhere-opensource-src-%VERSION% ./configure -embedded [architecture] //! [2] diff --git a/doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp b/doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp index 483c675..4f27661 100644 --- a/doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp +++ b/doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp @@ -260,3 +260,14 @@ class CustomItem : public QGraphicsItem ... }; //! [QGraphicsItem type] + +//! [18] +class QGraphicsPathItem : public QAbstractGraphicsShapeItem +{ + public: + enum { Type = 2 }; + int type() const { return Type; } + ... +}; +//! [18] + |