Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7
authorOlivier Goffart <olivier.goffart@nokia.com>
Mon, 18 Apr 2011 16:31:19 +0000 (18:31 +0200)
committerOlivier Goffart <olivier.goffart@nokia.com>
Mon, 18 Apr 2011 16:31:19 +0000 (18:31 +0200)
commitfda9cc1d8a0e49817d1c6192c52d18dffcecf327
treeaa9a3209339af6882eb496ab827f5ac297452d66
parent6814998ab4d9c6b0990b0bf01119ace69363ce3e
parentc8aafe9a63b13a4af3049c43fcd5e8cce27db829
Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7

Conflicts:
qmake/generators/makefile.cpp
qmake/generators/win32/msbuild_objectmodel.cpp
qmake/generators/win32/msvc_vcxproj.cpp
src/corelib/global/qnamespace.h
src/gui/text/qtextcontrol.cpp
32 files changed:
configure
mkspecs/common/symbian/symbian.conf
mkspecs/features/win32/embed_manifest_dll.prf
mkspecs/features/win32/embed_manifest_exe.prf
mkspecs/symbian-gcce/qmake.conf
qmake/generators/makefile.cpp
qmake/generators/unix/unixmake2.cpp
qmake/generators/win32/msvc_objectmodel.cpp
qmake/generators/win32/msvc_vcproj.cpp
qmake/generators/win32/msvc_vcproj.h
qmake/project.cpp
src/3rdparty/webkit/WebCore/WebCore.pro
src/corelib/global/qglobal.cpp
src/corelib/global/qglobal.h
src/corelib/global/qnamespace.h
src/corelib/global/qnamespace.qdoc
src/declarative/debugger/qdeclarativedebugserver.cpp
src/declarative/graphicsitems/qdeclarativegridview.cpp
src/declarative/graphicsitems/qdeclarativelistview.cpp
src/declarative/util/qdeclarativexmllistmodel.cpp
src/gui/gui.pro
src/gui/kernel/kernel.pri
src/gui/kernel/qapplication.cpp
src/gui/kernel/qapplication_s60.cpp
src/gui/kernel/qwidget_s60.cpp
src/gui/styles/qs60style.cpp
src/gui/styles/qs60style_s60.cpp
src/gui/styles/qstylesheetstyle.cpp
src/gui/text/qtextcontrol.cpp
src/openvg/qpaintengine_vg.cpp
src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp
src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h