Merge remote-tracking branch 'origin/stable' into dev
authorSimon Hausmann <simon.hausmann@digia.com>
Fri, 24 Jan 2014 15:37:45 +0000 (16:37 +0100)
committerSimon Hausmann <simon.hausmann@digia.com>
Fri, 24 Jan 2014 17:27:41 +0000 (18:27 +0100)
commit22041acdfe85c9a9b814e11cd86e8ee5a55be82d
tree1b4d1bfa0ebba9e5d1495b5ca7055dba94642c46
parent6ae57f01bb1495a74b23a81c590672ce788d5400
parent2407cd29e628671f7f5144e0d241d4249a3ab612
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
src/imports/dialogs/qquickmessagedialog.cpp
src/imports/dialogs/qquickmessagedialog_p.h
src/qml/debugger/qqmlprofilerservice_p.h
src/qml/jsruntime/qv4regexpobject.cpp
tests/auto/qml/debugger/qqmlprofilerservice/qqmlprofilerservice.pro

Change-Id: Ic8a43366b44d6970966acbf03b206d0dee00c28d
21 files changed:
src/qml/compiler/qv4isel_masm.cpp
src/qml/compiler/qv4regalloc.cpp
src/qml/debugger/qqmlprofilerservice_p.h
src/qml/jsapi/qjsvalue.cpp
src/qml/jsruntime/qv4engine.cpp
src/qml/jsruntime/qv4mm.cpp
src/qml/jsruntime/qv4regexpobject.cpp
src/qml/jsruntime/qv4regexpobject_p.h
src/qml/qml/qqmlcompiler.cpp
src/qml/qml/qqmlinstruction_p.h
src/qml/qml/qqmlmetatype.cpp
src/qml/qml/qqmlmetatype_p.h
src/quick/items/qquickmultipointtoucharea.cpp
src/quick/items/qquicktext.cpp
src/quick/items/qquickwindow.cpp
src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
src/quick/scenegraph/util/qsgatlastexture.cpp
src/quick/scenegraph/util/qsgtexture.cpp
tests/auto/qml/debugger/qqmlprofilerservice/qqmlprofilerservice.pro
tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
tests/auto/quick/qquicktext/tst_qquicktext.cpp