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 --- doc/enginio_global.qdocconf | 3 +-- src/enginio_client/doc/qtenginio.qdocconf | 2 +- src/enginio_plugin/doc/qtenginioqml.qdocconf | 2 +- 3 files changed, 3 insertions(+), 4 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_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.1 From 60a135102aaa37d0d817883e4d6aed456372709d Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 8 Feb 2016 14:56:54 +0100 Subject: Bump version Change-Id: Ib1d33c87fd26c2fedd141f92b5f86c22c4c63267 --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index 0344472..a4cf5c1 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) CONFIG += warning_clean CONFIG += qt_example_installs -MODULE_VERSION = 1.6.0 +MODULE_VERSION = 1.6.1 -- cgit v1.2.1 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(-) 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.1 From e415236eab3e6a8a127af860f77088b7f7bc5813 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 12 Feb 2016 16:08:58 +0100 Subject: consistently put {qt,qml}_{module,plugin} at the end of project files this fixes static builds by ensuring that all dependencies are exported. Task-number: QTBUG-51071 Change-Id: Ib9295d0bd8ce51505af6e39a381a4076c8ee2d6e Reviewed-by: Joerg Bornemann Reviewed-by: Frederik Gladhorn --- src/enginio_client/enginio_client.pro | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/enginio_client/enginio_client.pro b/src/enginio_client/enginio_client.pro index f3a158d..933f462 100644 --- a/src/enginio_client/enginio_client.pro +++ b/src/enginio_client/enginio_client.pro @@ -10,8 +10,6 @@ OTHER_FILES += \ include(../src.pri) -load(qt_module) - SOURCES += \ enginiobackendconnection.cpp \ enginioclient.cpp \ @@ -43,5 +41,6 @@ HEADERS += \ enginiooauth2authentication.h \ enginioreplystate.h - DEFINES += "ENGINIO_VERSION=\\\"$$MODULE_VERSION\\\"" + +load(qt_module) -- cgit v1.2.1 From cf717b99fdb1b7221dd556bf3be32feba0ed8afe Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 12 Feb 2016 16:09:09 +0100 Subject: standardize statement order in project files a bit Change-Id: I20422e195b91523aecb61f83fcbee4ef115bd673 Reviewed-by: Joerg Bornemann Reviewed-by: Frederik Gladhorn --- src/enginio_client/enginio_client.pro | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/enginio_client/enginio_client.pro b/src/enginio_client/enginio_client.pro index 933f462..f53bde7 100644 --- a/src/enginio_client/enginio_client.pro +++ b/src/enginio_client/enginio_client.pro @@ -1,7 +1,8 @@ TARGET = Enginio +MODULE = enginio + QT = core-private network DEFINES += ENGINIOCLIENT_LIBRARY -MODULE = enginio QMAKE_DOCS = $$PWD/doc/qtenginio.qdocconf OTHER_FILES += \ -- cgit v1.2.1 From 44e6129edc887819a2e468b624fb290609a7569b Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 21 Apr 2016 17:19:13 +0200 Subject: purge unreferenced image MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I0f66e4c8ceab283a063a152f15a5c86a7649a0c4 Reviewed-by: Jędrzej Nowacki --- examples/enginio/quick/image-gallery/image_gallery80.png | Bin 4945 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 examples/enginio/quick/image-gallery/image_gallery80.png diff --git a/examples/enginio/quick/image-gallery/image_gallery80.png b/examples/enginio/quick/image-gallery/image_gallery80.png deleted file mode 100644 index 6ad8096..0000000 Binary files a/examples/enginio/quick/image-gallery/image_gallery80.png and /dev/null differ -- cgit v1.2.1 From 65f5956b1cc00c58c964d43af16165e59a6f4e02 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 20 Apr 2016 20:42:30 +0200 Subject: fix example installs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ib3958d8188ab0a377727cf45d6ab5d8742d42137 Reviewed-by: Jędrzej Nowacki Reviewed-by: Oswald Buddenhagen --- examples/enginio/enginio.pro | 3 +++ examples/enginio/quick/image-gallery/image-gallery.pro | 3 +++ examples/enginio/quick/quick.pro | 3 +++ examples/enginio/quick/socialtodos/socialtodos.pro | 6 ++++++ examples/enginio/quick/todos/todos.pro | 3 +++ examples/enginio/quick/users/users.pro | 5 ++++- examples/enginio/widgets/cloudaddressbook/cloudaddressbook.pro | 3 +++ examples/enginio/widgets/image-gallery-cpp/image-gallery-cpp.pro | 3 +++ examples/enginio/widgets/todos-cpp/todos-cpp.pro | 3 +++ 9 files changed, 31 insertions(+), 1 deletion(-) diff --git a/examples/enginio/enginio.pro b/examples/enginio/enginio.pro index eb699a0..ae1323c 100644 --- a/examples/enginio/enginio.pro +++ b/examples/enginio/enginio.pro @@ -6,3 +6,6 @@ qtHaveModule(widgets) { SUBDIRS += quick } } + +EXAMPLE_FILES += \ + common diff --git a/examples/enginio/quick/image-gallery/image-gallery.pro b/examples/enginio/quick/image-gallery/image-gallery.pro index 7cac108..d65d496 100644 --- a/examples/enginio/quick/image-gallery/image-gallery.pro +++ b/examples/enginio/quick/image-gallery/image-gallery.pro @@ -13,3 +13,6 @@ OTHER_FILES += *.qml RESOURCES += \ gallery.qrc + +target.path = $$[QT_INSTALL_EXAMPLES]/enginio/quick/image-gallery +INSTALLS += target diff --git a/examples/enginio/quick/quick.pro b/examples/enginio/quick/quick.pro index 6433bbc..8c9886d 100644 --- a/examples/enginio/quick/quick.pro +++ b/examples/enginio/quick/quick.pro @@ -5,3 +5,6 @@ SUBDIRS += \ socialtodos \ todos \ users \ + +EXAMPLE_FILES += \ + main.cpp diff --git a/examples/enginio/quick/socialtodos/socialtodos.pro b/examples/enginio/quick/socialtodos/socialtodos.pro index e27f082..8b25667 100644 --- a/examples/enginio/quick/socialtodos/socialtodos.pro +++ b/examples/enginio/quick/socialtodos/socialtodos.pro @@ -19,3 +19,9 @@ OTHER_FILES += \ socialtodos.qml RESOURCES += socialtodos.qrc + +target.path = $$[QT_INSTALL_EXAMPLES]/enginio/quick/socialtodos +INSTALLS += target + +EXAMPLE_FILES += \ + backendconfig diff --git a/examples/enginio/quick/todos/todos.pro b/examples/enginio/quick/todos/todos.pro index 7e1e486..db26da7 100644 --- a/examples/enginio/quick/todos/todos.pro +++ b/examples/enginio/quick/todos/todos.pro @@ -11,3 +11,6 @@ mac: CONFIG -= app_bundle OTHER_FILES += todo.qml RESOURCES += todo.qrc + +target.path = $$[QT_INSTALL_EXAMPLES]/enginio/quick/todos +INSTALLS += target diff --git a/examples/enginio/quick/users/users.pro b/examples/enginio/quick/users/users.pro index 12fef03..cfe6a2b 100644 --- a/examples/enginio/quick/users/users.pro +++ b/examples/enginio/quick/users/users.pro @@ -10,4 +10,7 @@ SOURCES += ../main.cpp mac: CONFIG -= app_bundle OTHER_FILES += users.qml Browse.qml Login.qml Register.qml -RESOURCES += users.qrc \ No newline at end of file +RESOURCES += users.qrc + +target.path = $$[QT_INSTALL_EXAMPLES]/enginio/quick/users +INSTALLS += target diff --git a/examples/enginio/widgets/cloudaddressbook/cloudaddressbook.pro b/examples/enginio/widgets/cloudaddressbook/cloudaddressbook.pro index dd20cf2..d3a5b53 100644 --- a/examples/enginio/widgets/cloudaddressbook/cloudaddressbook.pro +++ b/examples/enginio/widgets/cloudaddressbook/cloudaddressbook.pro @@ -16,3 +16,6 @@ HEADERS += \ FORMS += \ mainwindow.ui + +target.path = $$[QT_INSTALL_EXAMPLES]/enginio/widgets/cloudaddressbook +INSTALLS += target diff --git a/examples/enginio/widgets/image-gallery-cpp/image-gallery-cpp.pro b/examples/enginio/widgets/image-gallery-cpp/image-gallery-cpp.pro index fad9ce1..008b11c 100644 --- a/examples/enginio/widgets/image-gallery-cpp/image-gallery-cpp.pro +++ b/examples/enginio/widgets/image-gallery-cpp/image-gallery-cpp.pro @@ -15,3 +15,6 @@ HEADERS += \ mainwindow.h \ imageobject.h \ imagemodel.h + +target.path = $$[QT_INSTALL_EXAMPLES]/enginio/widgets/image-gallery-cpp +INSTALLS += target diff --git a/examples/enginio/widgets/todos-cpp/todos-cpp.pro b/examples/enginio/widgets/todos-cpp/todos-cpp.pro index 3862441..84547c0 100644 --- a/examples/enginio/widgets/todos-cpp/todos-cpp.pro +++ b/examples/enginio/widgets/todos-cpp/todos-cpp.pro @@ -13,3 +13,6 @@ SOURCES += \ HEADERS += \ mainwindow.h \ todosmodel.h \ + +target.path = $$[QT_INSTALL_EXAMPLES]/enginio/widgets/todos-cpp +INSTALLS += target -- cgit v1.2.1 From d23fb94863da83b71223f9022eb75ea618fef690 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Tue, 10 May 2016 14:54:26 +0200 Subject: Doc: Remove repository name from examplesinstallpath Examples in binary packages now directly match the install path. Change-Id: Iefc58fb8e042ef45dda8e918fce4ea45ab0fc80d Task-number: QTBUG-52953 Reviewed-by: Antti Kokko --- src/enginio_client/doc/qtenginio.qdocconf | 2 +- src/enginio_plugin/doc/qtenginioqml.qdocconf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/enginio_client/doc/qtenginio.qdocconf b/src/enginio_client/doc/qtenginio.qdocconf index ff55798..c021df2 100644 --- a/src/enginio_client/doc/qtenginio.qdocconf +++ b/src/enginio_client/doc/qtenginio.qdocconf @@ -21,7 +21,7 @@ exampledirs += \ ../../../tests/auto \ # Specify example install dir under QT_INSTALL_EXAMPLES -examplesinstallpath = qtenginio/enginio/widgets +examplesinstallpath = enginio/widgets depends += qtcore qtgui qtwidgets qtnetwork qtquick qtenginioqml qtenginiooverview diff --git a/src/enginio_plugin/doc/qtenginioqml.qdocconf b/src/enginio_plugin/doc/qtenginioqml.qdocconf index f887f9f..5d3f4c5 100644 --- a/src/enginio_plugin/doc/qtenginioqml.qdocconf +++ b/src/enginio_plugin/doc/qtenginioqml.qdocconf @@ -22,7 +22,7 @@ exampledirs += \ ../../../tests/auto \ # Specify example install dir under QT_INSTALL_EXAMPLES -examplesinstallpath = qtenginio/enginio/quick +examplesinstallpath = enginio/quick depends += qtcore qtgui qtnetwork qtqml qtquick qtquickcontrols qtenginio qtenginiooverview -- cgit v1.2.1 From 5bddee78c2fe009610c982615d1d202399e464e8 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 19 May 2016 13:27:47 +0200 Subject: Bump version Change-Id: I26dfe1694c088a74d1256e75071a0d6dd2640f30 --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index a4cf5c1..4044454 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) CONFIG += warning_clean CONFIG += qt_example_installs -MODULE_VERSION = 1.6.1 +MODULE_VERSION = 1.6.2 -- cgit v1.2.1 From d5aec18177acc122b0b7c39a90fbb09d388a01b3 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 20 Apr 2016 21:23:02 +0200 Subject: do not enable example installs explicitly any more MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit it's done centrally now. Change-Id: Ib3f92139cc8f9dc5f6c878e3625a7866039e6dc8 Reviewed-by: Jędrzej Nowacki --- .qmake.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index 4044454..acf4106 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,5 +1,4 @@ load(qt_build_config) CONFIG += warning_clean -CONFIG += qt_example_installs MODULE_VERSION = 1.6.2 -- cgit v1.2.1 From b74e1ca024540d45105df95e47b9c93b263f7b75 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Fri, 10 Jun 2016 16:53:22 +0200 Subject: Add Q_DECL_OVERRIDE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes compilation with clang 3.8 Change-Id: I965a7d69e50a8b0ea5b541b164df431a390deb51 Reviewed-by: Jędrzej Nowacki --- src/enginio_plugin/enginioqmlclient_p_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/enginio_plugin/enginioqmlclient_p_p.h b/src/enginio_plugin/enginioqmlclient_p_p.h index e253205..a5ca531 100644 --- a/src/enginio_plugin/enginioqmlclient_p_p.h +++ b/src/enginio_plugin/enginioqmlclient_p_p.h @@ -57,7 +57,7 @@ public: static EnginioQmlClientPrivate* get(EnginioClientConnection *client) { return static_cast(EnginioClientConnectionPrivate::get(client)); } static EnginioQmlClient* get(EnginioClientConnectionPrivate *client) { return static_cast(client->q_ptr); } - virtual void init(); + virtual void init() Q_DECL_OVERRIDE; virtual void emitSessionTerminated() const Q_DECL_OVERRIDE; virtual void emitSessionAuthenticated(EnginioReplyState *reply) Q_DECL_OVERRIDE; virtual void emitSessionAuthenticationError(EnginioReplyState *reply) Q_DECL_OVERRIDE; -- cgit v1.2.1 From 6c37300c667e3049178f049a5b86e7ea955c9671 Mon Sep 17 00:00:00 2001 From: Sze Howe Koh Date: Wed, 15 Jun 2016 08:37:53 +0800 Subject: Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit" See http://comments.gmane.org/gmane.comp.lib.qt.devel/25771 Change-Id: I0bcedfe10dfbbf301b128d3bf5247452a531f199 Reviewed-by: Lars Knoll --- LICENSE.GPLv3 | 2 +- LICENSE.LGPLv21 | 2 +- LICENSE.LGPLv3 | 2 +- dist/packages/com.digia.enginio/meta/LICENSE.LGPL | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/LICENSE.GPLv3 b/LICENSE.GPLv3 index 4e49b12..71c4ad4 100644 --- a/LICENSE.GPLv3 +++ b/LICENSE.GPLv3 @@ -3,7 +3,7 @@ The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd. Contact: http://www.qt.io/licensing/ - You may use, distribute and copy the Qt GUI Toolkit under the terms of + You may use, distribute and copy the Qt Toolkit under the terms of GNU Lesser General Public License version 3. That license references the General Public License version 3, that is displayed below. Other portions of the Qt Toolkit may be licensed directly under this license. diff --git a/LICENSE.LGPLv21 b/LICENSE.LGPLv21 index 6e18461..dfcab5e 100644 --- a/LICENSE.LGPLv21 +++ b/LICENSE.LGPLv21 @@ -3,7 +3,7 @@ The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd. Contact: http://www.qt.io/licensing/ - You may use, distribute and copy the Qt GUI Toolkit under the terms of + You may use, distribute and copy the Qt Toolkit under the terms of GNU Lesser General Public License version 2.1, which is displayed below. ------------------------------------------------------------------------- diff --git a/LICENSE.LGPLv3 b/LICENSE.LGPLv3 index 4d67bac..6bf924c 100644 --- a/LICENSE.LGPLv3 +++ b/LICENSE.LGPLv3 @@ -3,7 +3,7 @@ The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd. Contact: http://www.qt.io/licensing/ - You may use, distribute and copy the Qt GUI Toolkit under the terms of + You may use, distribute and copy the Qt Toolkit under the terms of GNU Lesser General Public License version 3, which is displayed below. This license makes reference to the version 3 of the GNU General Public License, which you can find in the LICENSE.GPLv3 file. diff --git a/dist/packages/com.digia.enginio/meta/LICENSE.LGPL b/dist/packages/com.digia.enginio/meta/LICENSE.LGPL index 73cee11..58c2f62 100644 --- a/dist/packages/com.digia.enginio/meta/LICENSE.LGPL +++ b/dist/packages/com.digia.enginio/meta/LICENSE.LGPL @@ -3,7 +3,7 @@ The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd. Contact: http://www.qt.io/licensing/ - You may use, distribute and copy the Qt GUI Toolkit under the terms of + You may use, distribute and copy the Qt Toolkit under the terms of GNU Lesser General Public License version 2.1, which is displayed below. ------------------------------------------------------------------------- -- cgit v1.2.1