diff options
| -rw-r--r-- | doc/qtcreatordev/config/qtcreator-developer.qdocconf | 5 | ||||
| -rw-r--r-- | doc/qtcreatordev/src/qtcreator-module.qdoc | 12 | ||||
| -rw-r--r-- | src/libs/QtTaskTree/doc/src/qttasktree-module.qdoc | 12 | ||||
| -rw-r--r-- | src/libs/QtTaskTree/qtasktree.cpp | 2 |
4 files changed, 10 insertions, 21 deletions
diff --git a/doc/qtcreatordev/config/qtcreator-developer.qdocconf b/doc/qtcreatordev/config/qtcreator-developer.qdocconf index d72bee723d7..f74fb2c50f7 100644 --- a/doc/qtcreatordev/config/qtcreator-developer.qdocconf +++ b/doc/qtcreatordev/config/qtcreator-developer.qdocconf @@ -16,6 +16,7 @@ headerdirs = . \ ../src \ ../../../src/libs/aggregation \ ../../../src/libs/extensionsystem \ + ../../../src/libs/QtTaskTree \ ../../../src/libs/solutions \ ../../../src/libs/utils \ ../../../src/plugins/coreplugin @@ -24,6 +25,7 @@ sourcedirs = . \ ../src \ ../../../src/libs/aggregation \ ../../../src/libs/extensionsystem \ + ../../../src/libs/QtTaskTree \ ../../../src/libs/solutions \ ../../../src/libs/utils \ ../../../src/plugins/coreplugin @@ -46,7 +48,8 @@ imagedirs = ../images \ ../../../src/libs/solutions exampledirs = ../examples -depends += qtwidgets \ +depends += qtconcurrent \ + qtwidgets \ qtcore \ qtcore5compat \ qtqml \ diff --git a/doc/qtcreatordev/src/qtcreator-module.qdoc b/doc/qtcreatordev/src/qtcreator-module.qdoc index 8af9661ce89..7c9af9204ce 100644 --- a/doc/qtcreatordev/src/qtcreator-module.qdoc +++ b/doc/qtcreatordev/src/qtcreator-module.qdoc @@ -34,9 +34,10 @@ object pool. \row - \li \l{Tasking} - \li A solution containing a TaskTree and other classes for writing - declarative trees of asynchronous task flows. + \li \l{QtTaskTree} + \li Provides a declarative way to compose and execute asynchronous + task workflows with proper error handling and execution policies. + For more information, see \l {Qt TaskTree}. \row \li \l{Utils} @@ -123,11 +124,6 @@ \li \l{Spinner Solution}{Spinner} \li Renders a circular, endlessly animated progress indicator, which may be attached to any widget as an overlay. - - \row - \li \l{Tasking Solution}{Tasking} - \li Enables you to build extensible, declarative task tree structures - that contain possibly asynchronous tasks. \endtable \section1 Reference diff --git a/src/libs/QtTaskTree/doc/src/qttasktree-module.qdoc b/src/libs/QtTaskTree/doc/src/qttasktree-module.qdoc index 3ab034b7d07..91732f16015 100644 --- a/src/libs/QtTaskTree/doc/src/qttasktree-module.qdoc +++ b/src/libs/QtTaskTree/doc/src/qttasktree-module.qdoc @@ -25,18 +25,6 @@ \li \b {Iterators} - Support for loops and repetitive task execution. \endlist - \section1 Using the Module - - \include {module-use.qdocinc} {using the c++ api} - - \section2 Building with CMake - - \include {module-use.qdocinc} {building with cmake} {TaskTree} - - \section2 Building with qmake - - \include {module-use.qdocinc} {building_with_qmake} {tasktree} - \section1 Task adapters The module includes several built-in task adapters for common operations: diff --git a/src/libs/QtTaskTree/qtasktree.cpp b/src/libs/QtTaskTree/qtasktree.cpp index 7de5cc17fd6..5e227d25709 100644 --- a/src/libs/QtTaskTree/qtasktree.cpp +++ b/src/libs/QtTaskTree/qtasktree.cpp @@ -35,6 +35,8 @@ using namespace Qt::StringLiterals; \inmodule TaskTree \brief The QtTaskTree namespace encloses helper classes and global functions of the TaskTree module. + + \sa {Qt TaskTree} */ /*! |