diff options
| author | Alexis Menard <alexis.menard@nokia.com> | 2009-06-16 08:34:44 (GMT) |
|---|---|---|
| committer | Alexis Menard <alexis.menard@nokia.com> | 2009-06-16 08:34:44 (GMT) |
| commit | fec52b0c12386cbd3fd7d8cb886afaef5e30a744 (patch) | |
| tree | 01fa9a01f880e04f74d067e579d165904d02b11f /doc/src/snippets/code | |
| parent | 3dce31e5eb0fac43d445fb9664f1b68f4cd4c11f (diff) | |
| parent | ea83669b9b44b1fb3a5acae6d53afd1df401e9b5 (diff) | |
| download | Qt-fec52b0c12386cbd3fd7d8cb886afaef5e30a744.zip Qt-fec52b0c12386cbd3fd7d8cb886afaef5e30a744.tar.gz Qt-fec52b0c12386cbd3fd7d8cb886afaef5e30a744.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qt-main/qgraphicssceneindex
Conflicts:
src/gui/graphicsview/graphicsview.pri
src/gui/graphicsview/qgraphicsitem.cpp
Diffstat (limited to 'doc/src/snippets/code')
| -rw-r--r-- | doc/src/snippets/code/doc_src_introtodbus.qdoc | 5 | ||||
| -rw-r--r-- | doc/src/snippets/code/src_gui_qproxystyle.cpp | 15 |
2 files changed, 20 insertions, 0 deletions
diff --git a/doc/src/snippets/code/doc_src_introtodbus.qdoc b/doc/src/snippets/code/doc_src_introtodbus.qdoc index bedfe7f..97b14e9 100644 --- a/doc/src/snippets/code/doc_src_introtodbus.qdoc +++ b/doc/src/snippets/code/doc_src_introtodbus.qdoc @@ -1,3 +1,8 @@ //! [0] org.freedesktop.DBus //! [0] + +//! [QDBUS_DEBUG] +examples/dbus/remotecontrolledcar/controller/controller & +QDBUS_DEBUG=1 examples/dbus/remotecontrolledcar/car/car & +//! [QDBUS_DEBUG] diff --git a/doc/src/snippets/code/src_gui_qproxystyle.cpp b/doc/src/snippets/code/src_gui_qproxystyle.cpp new file mode 100644 index 0000000..7633160 --- /dev/null +++ b/doc/src/snippets/code/src_gui_qproxystyle.cpp @@ -0,0 +1,15 @@ +//! [0] +class MyProxyStyle : public QProxyStyle +{ +public: + + int styleHint(StyleHint hint, const QStyleOption *option = 0, + const QWidget *widget = 0, QStyleHintReturn *returnData = 0) const + { + if (hint == QStyle::SH_UnderlineShortcut) + return 1; + return QProxyStyle::styleHint(hint, option, widget, returnData); + } +}; + +//! [0] |