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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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>
*	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.1' into '1.2'v1.2.0-beta1 v1.2.0 1.2.0	Frederik Gladhorn	2015-03-31	1	-3/+3
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	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>
*	sync.profile: Point dependencies to an empty string	Sergio Ahumada	2014-05-13	1	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \|	This means that we are going to use the same branch name for the dependencies as the branch of the repository under test. If we are testing the 'stable' branch, all dependencies will point to the 'stable' branch as well. Change-Id: I254a65207d37600be0157d8f53a45d59e55533a0 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
*	Remove qtjsbackend from sync.profile	Frederik Gladhorn	2013-09-27	1	-1/+0
\| \| \| \| \| \| \|	qtjsbackend is gone, so remove the dep to make ci happy. Change-Id: I8d6d53e2d46f3783b73a959c09aedae08cb52e8e Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
*	Simplify the build system by changing the repository layout to	Frederik Gladhorn	2013-04-25	1	-0/+18
	follow the recommended Qt module structure. The Enginio library is now a proper Qt5 module so it can take advantage of the convenience provided by the module system.