diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 21:06:53 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 21:06:53 +0100 |
| commit | 0f6e294fb8534f677a5ec75113679cfe24f559c1 (patch) | |
| tree | 4e22d9a0b3af27f9603df259f42cf30d4277273d | |
| parent | f253f76aca4eb82a6df11c00a25c178e16253c9d (diff) | |
| parent | a6434420574f775d3afa6e8912eb2ede8429db90 (diff) | |
| download | qtenginio-5.7.0.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.75.7.0
Conflicts:
.qmake.conf
Change-Id: Ia24723d25cf0621078a9567ea95417d9a4048e6b
| -rw-r--r-- | doc/enginio_global.qdocconf | 3 | ||||
| -rw-r--r-- | src/enginio_client/doc/qtenginio.qdocconf | 2 | ||||
| -rw-r--r-- | src/enginio_client/enginioclient.h | 2 | ||||
| -rw-r--r-- | src/enginio_client/enginiomodel.h | 2 | ||||
| -rw-r--r-- | src/enginio_client/enginiooauth2authentication.h | 2 | ||||
| -rw-r--r-- | src/enginio_plugin/doc/qtenginioqml.qdocconf | 2 |
6 files changed, 6 insertions, 7 deletions
diff --git a/doc/enginio_global.qdocconf b/doc/enginio_global.qdocconf index 62c7f63..e057003 100644 --- a/doc/enginio_global.qdocconf +++ b/doc/enginio_global.qdocconf @@ -1,2 +1 @@ -navigation.homepage = "Enginio Manual" -buildversion = "Enginio $QT_VERSION Reference Documentation"
\ No newline at end of file +navigation.landingpage = "Enginio Manual" 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_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; 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" |