src/quick/items/qquickitemview_p_p.h · 4dbae9bda678de29ae82ea6cc88765f83e8d3f93 · BC / public / external / Qt / QtDeclarative · GitLab

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

An error occurred while loading the file. Please try again.

Find file Blame History Permalink

Merge branch 'dev' of ssh://codereview.qt-project.org/qt/qtdeclarative into wip/v4 · 3a6f5735

Simon Hausmann authored 11 years ago

Conflicts:
	src/quick/items/context2d/qquickcontext2d.cpp
	tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro

Change-Id: I36a4fd28b3156839aecd70039a3ba566bf19a0bc

3a6f5735

.gitattributes 151 B

.tag                    export-subst

.gitignore              export-ignore

.gitattributes          export-ignore

.commit-template        export-ignore