From 2a19257a5eef7a25a05d5cf7ea69ecc4184226f3 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Mon, 14 Dec 2015 12:30:28 +0100 Subject: Doc: Fix navigation and build version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix documentation navigation: - Default to Qt index page as the home page - Use the same landing page for all doc modules - Remove custom build version (it now follows Qt version) - Add navigation for C++ classes, QML types Change-Id: I3b00940dabb3cd518cffe2e21a87913e008a912e Reviewed-by: Venugopal Shivashankar Reviewed-by: Jędrzej Nowacki --- src/enginio_client/doc/qtenginio.qdocconf | 2 +- src/enginio_plugin/doc/qtenginioqml.qdocconf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/enginio_client/doc/qtenginio.qdocconf b/src/enginio_client/doc/qtenginio.qdocconf index aa9b3b4..ff55798 100644 --- a/src/enginio_client/doc/qtenginio.qdocconf +++ b/src/enginio_client/doc/qtenginio.qdocconf @@ -49,4 +49,4 @@ qhp.QtEnginio.subprojects.examples.indexTitle = Enginio C++ Classes and Examples qhp.QtEnginio.subprojects.examples.selectors = fake:example qhp.QtEnginio.subprojects.examples.sortPages = true -navigation.landingpage = "Enginio C++ Classes and Examples" +navigation.cppclassespage = "Enginio C++ Classes and Examples" diff --git a/src/enginio_plugin/doc/qtenginioqml.qdocconf b/src/enginio_plugin/doc/qtenginioqml.qdocconf index fb69034..f887f9f 100644 --- a/src/enginio_plugin/doc/qtenginioqml.qdocconf +++ b/src/enginio_plugin/doc/qtenginioqml.qdocconf @@ -50,4 +50,4 @@ qhp.QtEnginioQml.subprojects.examples.indexTitle = Enginio QML Types and Example qhp.QtEnginioQml.subprojects.examples.selectors = fake:example qhp.QtEnginioQml.subprojects.examples.sortPages = true -navigation.landingpage = "Enginio QML Types and Examples" +navigation.qmltypespage = "Enginio QML Types and Examples" -- cgit v1.2.3 From a6434420574f775d3afa6e8912eb2ede8429db90 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 3 Mar 2016 14:13:06 +0100 Subject: Make public headers compile with -Wzero-as-null-pointer-constant ... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Change-Id: I799040633b2d1fc15ccafb42b4eb932b55cf1a55 Task-number: QTBUG-45291 Reviewed-by: Lars Knoll --- src/enginio_client/enginioclient.h | 2 +- src/enginio_client/enginiomodel.h | 2 +- src/enginio_client/enginiooauth2authentication.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/enginio_client/enginioclient.h b/src/enginio_client/enginioclient.h index b0dc8f7..2083b80 100644 --- a/src/enginio_client/enginioclient.h +++ b/src/enginio_client/enginioclient.h @@ -53,7 +53,7 @@ class ENGINIOCLIENT_EXPORT EnginioClient : public EnginioClientConnection Q_DECLARE_PRIVATE(EnginioClient) public: - explicit EnginioClient(QObject *parent = 0); + explicit EnginioClient(QObject *parent = Q_NULLPTR); ~EnginioClient(); Q_INVOKABLE EnginioReply *customRequest(const QUrl &url, const QByteArray &httpOperation, const QJsonObject &data = QJsonObject()); diff --git a/src/enginio_client/enginiomodel.h b/src/enginio_client/enginiomodel.h index 8b64daa..d949077 100644 --- a/src/enginio_client/enginiomodel.h +++ b/src/enginio_client/enginiomodel.h @@ -57,7 +57,7 @@ class ENGINIOCLIENT_EXPORT EnginioModel Q_PROPERTY(QJsonObject query READ query WRITE setQuery NOTIFY queryChanged) public: - explicit EnginioModel(QObject *parent = 0); + explicit EnginioModel(QObject *parent = Q_NULLPTR); ~EnginioModel(); EnginioClient *client() const Q_REQUIRED_RESULT; diff --git a/src/enginio_client/enginiooauth2authentication.h b/src/enginio_client/enginiooauth2authentication.h index f276652..c8a724f 100644 --- a/src/enginio_client/enginiooauth2authentication.h +++ b/src/enginio_client/enginiooauth2authentication.h @@ -48,7 +48,7 @@ class ENGINIOCLIENT_EXPORT EnginioOAuth2Authentication : public EnginioIdentity Q_DECLARE_PRIVATE(EnginioOAuth2Authentication) public: - explicit EnginioOAuth2Authentication(QObject *parent = 0); + explicit EnginioOAuth2Authentication(QObject *parent = Q_NULLPTR); ~EnginioOAuth2Authentication(); QString user() const Q_REQUIRED_RESULT; -- cgit v1.2.3