Skip to content
GitLab
Commit 4821058f authored by Kent Hansen's avatar Kent Hansen
Browse files

Merge master into api_changes 

Conflicts:
	src/qml/debugger/qqmlenginedebugservice.cpp
	src/qml/qml/v8/qv8qobjectwrapper.cpp
	src/quick/util/qquickimageprovider.cpp
	tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp

Change-Id: Ie78ba2fabd32f4812bcae9dbdd66ed289dc11dcb
parents 83f11e33 26d5f2e8
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 397 additions and 397 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