diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-08-17 10:43:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-08-17 10:44:06 +0200 |
| commit | d2269c4e68f283f704547a0a96a662b5feeea732 (patch) | |
| tree | 7ec91301698766e7195b0328083f2ceb1cc1f732 | |
| parent | 0a234cd7497b87cca44fe66ed222c2581bf1f5c8 (diff) | |
| parent | 6e0341bc878ff82d3c1039dcce09f92269546189 (diff) | |
Merge remote-tracking branch 'origin/5.9' into devv5.10.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I29392cca54915da0aafa1acf75c18c0176348a8d
| -rw-r--r-- | src/remoteobjects/doc/src/remoteobjects-cpp.qdoc | 3 | ||||
| -rw-r--r-- | src/remoteobjects/doc/src/remoteobjects-index.qdoc | 7 | ||||
| -rw-r--r-- | src/remoteobjects/doc/src/remoteobjects-replica.qdoc | 2 | ||||
| -rw-r--r-- | src/remoteobjects/doc/src/remoteobjects-source.qdoc | 2 | ||||
| -rw-r--r-- | src/repparser/repparser.pro | 2 |
5 files changed, 7 insertions, 9 deletions
diff --git a/src/remoteobjects/doc/src/remoteobjects-cpp.qdoc b/src/remoteobjects/doc/src/remoteobjects-cpp.qdoc index 54d9781..ed59fef 100644 --- a/src/remoteobjects/doc/src/remoteobjects-cpp.qdoc +++ b/src/remoteobjects/doc/src/remoteobjects-cpp.qdoc @@ -50,6 +50,5 @@ Use the following include in you source files: \snippet doc_src_remoteobjects.h qtremoteobject_include - See \l{Getting Started with Qt Remote Objects} page for - an introduction to the module. + See \l{Overview Qt Remote Objects} for an introduction to the module. */ diff --git a/src/remoteobjects/doc/src/remoteobjects-index.qdoc b/src/remoteobjects/doc/src/remoteobjects-index.qdoc index 27bc09f..cdcba51 100644 --- a/src/remoteobjects/doc/src/remoteobjects-index.qdoc +++ b/src/remoteobjects/doc/src/remoteobjects-index.qdoc @@ -95,11 +95,10 @@ QT += remoteobjects \section2 Guides \list \li \l {Overview Qt Remote Objects} - \li \l {Getting Started with Qt Remote Objects} - \li \l {Qt Remote Objects C++ classes} + \li \l {Qt Remote Objects C++ Classes} \li \l {Qt Remote Objects Nodes} - \li \l {Qt Remote Objects Source Objects} - \li \l {Qt Remote Objects Replica Objects} + \li \l {Source Objects}{Qt Remote Objects Source Objects} + \li \l {Replica Objects}{Qt Remote Objects Replica Objects} \li \l {Qt Remote Objects Registry} \li \l {Qt Remote Objects Compiler} \li \l {Remote Object Interaction} diff --git a/src/remoteobjects/doc/src/remoteobjects-replica.qdoc b/src/remoteobjects/doc/src/remoteobjects-replica.qdoc index 4ffa50d..8da24e8 100644 --- a/src/remoteobjects/doc/src/remoteobjects-replica.qdoc +++ b/src/remoteobjects/doc/src/remoteobjects-replica.qdoc @@ -35,7 +35,7 @@ \title Qt Remote Objects Replica \brief Describes how the remote object replica works as a proxy object. \target Replica -\section1 Replica objects +\section1 Replica Objects A remote object replica is a proxy object that has (approximately) the same API as the \l {Source} QObject it is replicating. There are a few additional diff --git a/src/remoteobjects/doc/src/remoteobjects-source.qdoc b/src/remoteobjects/doc/src/remoteobjects-source.qdoc index 49d42a5..0106728 100644 --- a/src/remoteobjects/doc/src/remoteobjects-source.qdoc +++ b/src/remoteobjects/doc/src/remoteobjects-source.qdoc @@ -35,7 +35,7 @@ \title Qt Remote Objects Source \brief Introduction to using Source \target Source -\section1 Source objects +\section1 Source Objects A Remote Object Source is the QObject that is responsible for the implementation of the exposed API. diff --git a/src/repparser/repparser.pro b/src/repparser/repparser.pro index 4609b36..ffdf980 100644 --- a/src/repparser/repparser.pro +++ b/src/repparser/repparser.pro @@ -3,7 +3,7 @@ MODULE = repparser # Dont produce a library CONFIG += header_module - +QT = core load(qt_module) def_build = debug |