delta/qt5/qtenginio.git - code.qt.io: qt/qtenginio.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Replace Q_NULLPTR with nullptrHEAD dev	Kevin Funk	2017-09-26	3	-3/+3
\| \| \| \| \|	Change-Id: I6125e1e4f280b9f36f3146777a67a3a0443c5905 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
*	Merge remote-tracking branch 'origin/5.7' into dev	Liang Qi	2016-11-26	1	-13/+0
\|\ \| \| \| \| \| \|	Change-Id: I90884cb3f4f7f68f3e85fb9879db6d28eb7beded
\| *	Merge remote-tracking branch 'origin/5.6' into 5.75.7	Liang Qi	2016-11-25	1	-13/+0
\| \|\ \| \| \| \| \| \| \| \| \|	Change-Id: I5195708933af0783b51c03c27b3f705f4fb87d5c
\| \| *	remove dependencies from sync.profile	Oswald Buddenhagen	2016-11-05	1	-13/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the CI obtains them from the qt5 super repo nowadays. Change-Id: I7f4bfad6e0210dc4e51a035b12206e4b1b9b5cba Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* \| \|	Merge branch 'origin/5.7' into dev	Oswald Buddenhagen	2016-07-01	23	-20/+48
\|\ \ \ \| \|/ / \| \| \| \| \| \|	Change-Id: I7201e93cbd1bd0f605950f573fd79a6214909201
\| * \|	Merge remote-tracking branch 'origin/5.6' into 5.7	Oswald Buddenhagen	2016-07-01	6	-6/+5
\| \|\ \ \| \| \|/ \| \| \| \| \| \|	Change-Id: I58f3843f7dffd69b3924b652b8401ce5de2021ba
\| \| *	Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit"v5.6.2 5.6.2	Sze Howe Koh	2016-06-19	4	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See http://comments.gmane.org/gmane.comp.lib.qt.devel/25771 Change-Id: I0bcedfe10dfbbf301b128d3bf5247452a531f199 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
\| \| *	Add Q_DECL_OVERRIDE	Robert Loehning	2016-06-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes compilation with clang 3.8 Change-Id: I965a7d69e50a8b0ea5b541b164df431a390deb51 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
\| \| *	do not enable example installs explicitly any more	Oswald Buddenhagen	2016-05-24	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	it's done centrally now. Change-Id: Ib3f92139cc8f9dc5f6c878e3625a7866039e6dc8 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
\| * \|	Merge remote-tracking branch 'origin/5.6' into 5.7	Liang Qi	2016-05-23	13	-7/+37
\| \|\ \ \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: .qmake.conf Change-Id: Ie164bbaaa8c78c13d75c85d0edcc2ea4d76fe738
\| \| *	Bump version	Oswald Buddenhagen	2016-05-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I26dfe1694c088a74d1256e75071a0d6dd2640f30
\| \| *	Doc: Remove repository name from examplesinstallpathv5.6.1-1 v5.6.1 5.6.1	Topi Reinio	2016-05-12	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Examples in binary packages now directly match the install path. Change-Id: Iefc58fb8e042ef45dda8e918fce4ea45ab0fc80d Task-number: QTBUG-52953 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
\| \| *	fix example installs	Oswald Buddenhagen	2016-04-28	9	-1/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: Ib3958d8188ab0a377727cf45d6ab5d8742d42137 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
\| \| *	purge unreferenced image	Oswald Buddenhagen	2016-04-28	1	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I0f66e4c8ceab283a063a152f15a5c86a7649a0c4 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
\| \| *	standardize statement order in project files a bit	Oswald Buddenhagen	2016-04-13	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I20422e195b91523aecb61f83fcbee4ef115bd673 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
\| \| *	consistently put {qt,qml}_{module,plugin} at the end of project files	Oswald Buddenhagen	2016-04-13	1	-3/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	this fixes static builds by ensuring that all dependencies are exported. Task-number: QTBUG-51071 Change-Id: Ib9295d0bd8ce51505af6e39a381a4076c8ee2d6e Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
\| * \|	Merge remote-tracking branch 'origin/5.6' into 5.75.7.0	Liang Qi	2016-03-07	6	-7/+6
\| \|\ \ \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: .qmake.conf Change-Id: Ia24723d25cf0621078a9567ea95417d9a4048e6b
\| \| *	Make public headers compile with -Wzero-as-null-pointer-constant	Marc Mutz	2016-03-03	3	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... 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 <lars.knoll@theqtcompany.com>
\| \| *	Bump version	Oswald Buddenhagen	2016-02-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: Ib1d33c87fd26c2fedd141f92b5f86c22c4c63267
\| \| *	Doc: Fix navigation and build versionv5.6.0 5.6.0	Topi Reinio	2015-12-15	3	-4/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 <venugopal.shivashankar@digia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* \| \|	Bump version	Oswald Buddenhagen	2016-02-23	1	-1/+1
\|/ / \| \| \| \| \| \|	Change-Id: I03e9d964a4811efb80f09be49aac153577b7ac53
* \|	Do not export fully inlined class	Kai Koehne	2015-12-01	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Exporting a class deriving from QPair fails in MSVC 2015 RTM after commit 226ce6020ee4eb in qtbase. Task-number: QTBUG-49658 Change-Id: Id07e620a4a2d0f454232f349a51380170f5230ce Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* \|	Merge remote-tracking branch 'origin/5.6' into dev	Liang Qi	2015-12-01	3	-16/+4
\|\ \ \| \|/ \| \| \| \|	Change-Id: I246933c28cb401fbec5e6469ae31807453190be3
\| *	Doc: Remove example highlightingv5.6.0-beta1	Topi Reinio	2015-11-27	1	-3/+0
\| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I6ea9808d068ef72993d63f2fe62bc13461d89bff Task-number: QTBUG-49458 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
\| *	Fix debug-and-release build	Frederik Gladhorn	2015-11-06	1	-11/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enginio is part of the Qt release and there is no need to do magic hacks to install the qmldir file. This was supposed to help running examples separately, but we assume that the lib is shipped with Qt proper. The problem was that the qmldir file would be simultaneously copied into the same location twice which will fail on Windows. Change-Id: I57dc18af361f4bdfc00c8c4a12bbe1f0986eb34f Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
\| *	Doc: Update examplesinstallpath to include the repository name	Topi Reinio	2015-10-21	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The examplesinstallpath variable in .qdocconf files defines the path under QT_INSTALL_EXAMPLES where examples are found. To match the way examples are packaged in Qt 5.6, prefix each install path with the repository name. Task-number: QTBUG-48736 Change-Id: I0bd2e054b8302f7c0054469e85265a4bebf24c50 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* \|	Merge remote-tracking branch 'origin/5.6' into dev	Liang Qi	2015-10-14	8	-6/+975
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \|	Conflicts: .qmake.conf Change-Id: I22f4404e29faf0a8688d768341af7dad43c46e49
\| *	Merge remote-tracking branch 'origin/1.2' into 5.6	Liang Qi	2015-10-13	3	-0/+689
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: .qmake.conf Change-Id: Icaade4d6cab13f7b8b7ffc3b8a759effe5aafaf9
\| \| *	Merge remote-tracking branch 'origin/1.1' into 1.2v1.2.1 1.2.1 1.2	Liang Qi	2015-08-19	0	-0/+0
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: .qmake.conf Change-Id: I4448f5660650e797027013fbd5682f4c920c88d5
\| \| \| *	Bump version1.1	Oswald Buddenhagen	2015-04-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I374710d0471fa133f5ca1cee3169cf2038e123f0
\| \| * \|	Add the GPLv3 license text	Thiago Macieira	2015-08-13	2	-0/+688
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	LGPLv3 refers to it but does not include it in its body. Change-Id: Ib056b47dde3341ef9a52ffff13eed18cf3504738 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
\| \| * \|	Doc: Added \qtvariable to enable QDoc include QT += info.	Venugopal Shivashankar	2015-07-31	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-47274 Change-Id: Ie8ffad3e9e464352c02bf2026541be571b3a93dd Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
\| \| * \|	Bump version	Oswald Buddenhagen	2015-06-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I9a4b5951e5dfa705fbcfd15c8d2a867b86ed269e
\| * \| \|	Doc: replaced \target with \keyword at top of page	Nico Vertriest	2015-09-30	4	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	A \target whose purpose is to link to the top of a page (and not to a section within a page) works better as a \keyword, because \target generates a new html anchor which, in this case, is not tied to any title element on the page. A \keyword links to the page itself, as expected. Task-number: QTBUG-48482 Change-Id: Ia570d8cb344840f62e7d32b462346b19668861cd Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
\| * \| \|	Update plugins.qmltypes	Kai Koehne	2015-09-18	2	-2/+282
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I006d1d38b9a592e8eea6c4218b788fa585ef4512 Reviewed-by: Marco Benelli <marco.benelli@theqtcompany.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
\| * \| \|	set the version number to 1.6 to have at least the minor version match qt	Oswald Buddenhagen	2015-09-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: If485e4b55934d419cd21b7ae39c9e7394ef20ca3
* \| \| \|	Bump version	Oswald Buddenhagen	2015-09-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I7945e8e872ced7d4de2ee3c161f008f2eba9a499
* \| \| \|	Merge remote-tracking branch 'origin/5.6' into dev	Liang Qi	2015-09-03	1	-3/+3
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \|	Change-Id: I0aaa91f5c77f2d2b55513e3fe8c069981caff5e8
\| * \| \|	Update sync.profile after branching.v5.6.0-alpha1	Jędrzej Nowacki	2015-08-25	1	-3/+3
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I5bd31895c2d131e6a3765202a285c3844d0ac33a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* \| \|	Merge remote-tracking branch 'origin/1.2' into dev5.5 1.3	Liang Qi	2015-06-06	31	-891/+1059
\|\ \ \ \| \|/ / \| \| \| \| \| \|	Change-Id: I719253298a760e88a6ebab0cbf27e35cecc418a9
\| * \|	Merge remote-tracking branch 'origin/1.1' into '1.2'v1.2.0-beta1 v1.2.0 1.2.0	Frederik Gladhorn	2015-03-31	21	-173/+401
\| \|\ \ \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: .qmake.conf LICENSE.LGPLv21 LICENSE.LGPLv3 src/enginio_client/chunkdevice_p.h src/enginio_client/enginio.h src/enginio_client/enginiobackendconnection.cpp src/enginio_client/enginiobackendconnection_p.h src/enginio_client/enginiobasemodel.h src/enginio_client/enginiobasemodel_p.h src/enginio_client/enginioclient.cpp src/enginio_client/enginioclient.h src/enginio_client/enginioclient_global.h src/enginio_client/enginioclient_p.h src/enginio_client/enginioclientconnection.h src/enginio_client/enginiodummyreply.cpp src/enginio_client/enginiodummyreply_p.h src/enginio_client/enginiofakereply.cpp src/enginio_client/enginiofakereply_p.h src/enginio_client/enginioidentity.cpp src/enginio_client/enginioidentity.h src/enginio_client/enginiomodel.cpp src/enginio_client/enginiomodel.h src/enginio_client/enginiooauth2authentication.h src/enginio_client/enginioobjectadaptor_p.h src/enginio_client/enginioreply.cpp src/enginio_client/enginioreply.h src/enginio_client/enginioreply_p.h src/enginio_client/enginioreplystate.h src/enginio_client/enginiostring.cpp src/enginio_client/enginiostring_p.h src/enginio_plugin/enginioplugin.cpp src/enginio_plugin/enginioplugin_p.h src/enginio_plugin/enginioqmlclient.cpp src/enginio_plugin/enginioqmlclient_p.h src/enginio_plugin/enginioqmlclient_p_p.h src/enginio_plugin/enginioqmlmodel.cpp src/enginio_plugin/enginioqmlmodel_p.h src/enginio_plugin/enginioqmlobjectadaptor_p.h src/enginio_plugin/enginioqmlreply.cpp src/enginio_plugin/enginioqmlreply_p.h tests/auto/common/common.cpp tests/auto/common/common.h tests/auto/enginioclient/tst_enginioclient.cpp tests/auto/enginiomodel/tst_enginiomodel.cpp tests/auto/files/tst_files.cpp tests/auto/identity/common/identitycommon.h tests/auto/identity/oauth2authentication/tst_oauth2authentication.cpp tests/auto/notifications/tst_notifications.cpp tests/auto/qmltests/tst_enginioclient.qml tests/auto/qmltests/tst_enginioreply.qml tests/auto/qmltests/tst_files.qml tests/auto/qmltests/tst_identity.qml tests/auto/qmltests/tst_model.qml tests/auto/qmltests/tst_qmltest.cpp tests/auto/qmltests/tst_query.qml Change-Id: Icb6a167ba58b41e1a8e4d2c8f78213eae9472864
\| \| *	Doc: Fix missing type in \qmlproperty1.1.2	Sergio Ahumada	2015-03-11	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	enginioplugin.cpp:122: warning: Missing property type for EnginioOAuth2Authentication::user enginioplugin.cpp:128: warning: Missing property type for EnginioOAuth2Authentication::password Change-Id: I493e7fb3e4adc1a8dbb39c2c5356730bd7ce3a02 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
\| \| *	Doc: corrected issue cloudaddressbook	Nico Vertriest	2015-02-24	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-43810 Change-Id: Ia8b2cac78e4acdd106ebbb139c66c0183ded077d Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
\| \| *	Merge remote-tracking branch 'origin/1.1.1' into 1.1	Frederik Gladhorn	2015-02-18	5	-8/+8
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I1d4f5d29e5d72df2479de2a33b2d7cb010946fea
\| \| \| *	Autotest: Use resources for test filesv1.1.1 1.1.1	Rainer Keller	2015-02-05	5	-8/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I4e1aac17ea5d0c4e24e8e1cc5b6ee128e5be3184 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
\| \| * \|	Bump version	Oswald Buddenhagen	2015-01-16	1	-1/+1
\| \| \|/ \| \| \| \| \| \| \| \| \|	Change-Id: I5e8c61bb57ab7de594647399701c5c09cabe1ad7
\| \| *	Bump version	Oswald Buddenhagen	2014-12-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: Ibdafbb4648e7152cecdb643f5d473cdbc30128bf
\| \| *	Update sync.profile	Jędrzej Nowacki	2014-10-13	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The 1.1 version of enginio should track Qt5.4 Change-Id: Icddbb933fa4ad2f9b860ec873030162564440f05 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
\| \| *	Doc: apply title case in section1 qtenginio	Nico Vertriest	2014-10-03	3	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-40362 Change-Id: I3e95f9cd108acd57c0594c128ab2643231babe7d Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
\| \| *	Add QML documentation for OAuth2 identification	Jędrzej Nowacki	2014-09-26	1	-10/+43
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-41493 Change-Id: Ic6b768a21e294dddda730cf34145912aabcf30db Reviewed-by: Martin Smith <martin.smith@digia.com>