From 1c0ca1f3d840b3ae4f5d11f8657ea0680915ab68 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Fri, 22 May 2020 10:32:02 +0200 Subject: Document how to use CMake for Qt DBus Task-number: QTBUG-73058 Change-Id: Ibe0779d109682cc41e21783a3ba5fa5130d5ff7f Reviewed-by: Paul Wicking --- src/dbus/doc/src/qtdbus-index.qdoc | 10 +++++++++- src/dbus/doc/src/qtdbus-module.qdoc | 18 +----------------- 2 files changed, 10 insertions(+), 18 deletions(-) (limited to 'src/dbus/doc/src') diff --git a/src/dbus/doc/src/qtdbus-index.qdoc b/src/dbus/doc/src/qtdbus-index.qdoc index 0cda4d2a8d..1023022a1d 100644 --- a/src/dbus/doc/src/qtdbus-index.qdoc +++ b/src/dbus/doc/src/qtdbus-index.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. @@ -32,6 +32,14 @@ \keyword QtDBus + \include module-use.qdocinc using qt module + \snippet snippets/CMakeLists.txt cmake_use + + See also the \l[QtDoc]{Building with CMake} overview. + + \include module-use.qdocinc building with qmake + \snippet snippets/snippets.pro qmake_use + \section1 Introduction D-Bus is an Inter-Process Communication (IPC) and Remote Procedure diff --git a/src/dbus/doc/src/qtdbus-module.qdoc b/src/dbus/doc/src/qtdbus-module.qdoc index 0ef5999b11..a1abfaa24b 100644 --- a/src/dbus/doc/src/qtdbus-module.qdoc +++ b/src/dbus/doc/src/qtdbus-module.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. @@ -47,22 +47,6 @@ to connect to a signal emitted remotely as well as to connect a local signal to remote slot. - To use this module, use the following code in your application: - - \snippet code/doc_src_qtdbus.cpp 0 - - \if !defined(qtforpython) - If you're using qmake to build your application, you can add this - line to your .pro file to make it link against the Qt D-Bus - libraries: - - \snippet code/doc_src_qtdbus.pro 1 - - \note The source code for this module is located in the \c{src/qdbus} - directory. When installing Qt from source, this module is built when Qt's - tools are built. - \endif - See the \l {Qt D-Bus}{D-Bus} page for detailed information on how to use this module. */ -- cgit v1.2.3