diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-19 14:07:29 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-19 14:07:29 +0100 |
| commit | 6283d0c106e4caeaf25557864890745ab3fe6a3d (patch) | |
| tree | 5d492389b1504dc6cafe4f218ade3fb7f07df3cb /src/qdbus | |
| parent | dab033616c1c33b0f334ae86bef2a8d07ff4213a (diff) | |
| parent | 9a00d1a01b1f7dc89ebe19adfa539af1fd1d3ecd (diff) | |
| download | qttools-6283d0c106e4caeaf25557864890745ab3fe6a3d.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
Change-Id: Ifdb0e36fde8a63e1a768f1c876521e908810244d
Diffstat (limited to 'src/qdbus')
| -rw-r--r-- | src/qdbus/qdbusviewer/qdbusviewer.cpp | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/src/qdbus/qdbusviewer/qdbusviewer.cpp b/src/qdbus/qdbusviewer/qdbusviewer.cpp index d4c70a770..3f0a37d78 100644 --- a/src/qdbus/qdbusviewer/qdbusviewer.cpp +++ b/src/qdbus/qdbusviewer/qdbusviewer.cpp @@ -523,19 +523,3 @@ void QDBusViewer::anchorClicked(const QUrl &url) tree->scrollTo(idx); tree->setCurrentIndex(idx); } - -/*! - \page qdbusviewer.html - \title D-Bus Viewer - \keyword qdbusviewer - - The Qt D-Bus Viewer is a tool that lets you introspect D-Bus objects and messages. You can - choose between the system bus and the session bus. Click on any service on the list - on the left side to see all the exported objects. - - You can invoke methods by double-clicking on them. If a method takes one or more IN parameters, - a property editor opens. - - Right-click on a signal to connect to it. All emitted signals including their parameters - are output in the message view on the lower side of the window. -*/ |