Skip to content
GitLab
Commit 6e22ead1 authored by Alan Alpert's avatar Alan Alpert
Browse files

Merge branch 'master' into qtquick2 

Conflicts:
	src/declarative/graphicsitems/qdeclarativetextinput.cpp
	src/declarative/qml/qdeclarativeengine.cpp
parents 6dbd4286 b6b1aebf
Hide whitespace changes
Inline Side-by-side
Showing
with 2216 additions and 37 deletions
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment