From 3af6618f98fe53e0288bc604fca4d03b3fd5d906 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 30 Jun 2017 09:53:06 +0200 Subject: Bump version Change-Id: I4a2bbcc4edbf9d779bf32b5c46cdbf9c65f43118 --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index f4b2c5d..c38da4b 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,6 +1,6 @@ load(qt_build_config) CONFIG += qt_example_installs -MODULE_VERSION = 5.9.1 +MODULE_VERSION = 5.9.2 QTRO_SOURCE_TREE = $$PWD -- cgit v1.2.3 From 9337e8cb0776878bef246b08b921681f4dc2e3d6 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Tue, 4 Jul 2017 12:58:01 +0200 Subject: Only the core module is needed for this, so just specify that Change-Id: I2677fd2827b0f26fc15ccb0879154282913cd63b Reviewed-by: Kevin Funk Reviewed-by: Brett Stottlemyer --- src/repparser/repparser.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3 From 6e0341bc878ff82d3c1039dcce09f92269546189 Mon Sep 17 00:00:00 2001 From: Nico Vertriest Date: Thu, 27 Jul 2017 13:53:23 +0200 Subject: Doc: correct several link errors - removed reference to Getting Started with Qt Remote Objects: replaced with reference to overview document - fixed links to souce objects and replica objects Change-Id: I1a8d02fd421160ca531491935cf69a31568db165 Reviewed-by: Venugopal Shivashankar --- src/remoteobjects/doc/src/remoteobjects-cpp.qdoc | 3 +-- src/remoteobjects/doc/src/remoteobjects-index.qdoc | 7 +++---- src/remoteobjects/doc/src/remoteobjects-replica.qdoc | 2 +- src/remoteobjects/doc/src/remoteobjects-source.qdoc | 2 +- 4 files changed, 6 insertions(+), 8 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. -- cgit v1.2.3