src/quick/qtquick2.cpp · a7017465152d544a4217d5ce4f6f84b80cb9b8b9 · BC / public / external / Qt / QtDeclarative

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.

Blame History

Merge remote-tracking branch 'origin/master' into api_changes · a896d4b3

Lars Knoll authored Apr 11, 2012

Conflicts:
	src/qml/debugger/qqmlprofilerservice_p.h
	src/qml/qml/qqmlboundsignal.cpp
	src/qml/qml/v4/qv4bindings.cpp
	src/quick/items/qquickshadereffect.cpp
	src/quick/particles/qquickcustomparticle.cpp
	src/quick/qtquick2.cpp

Change-Id: Ia9c6517035ae912fa75e77473a452bd3383def56

a896d4b3

Admin message