projects / qt:qt.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ca7be48 33f0f83)
Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7
authorOlivier Goffart <olivier.goffart@nokia.com>
Wed, 23 Feb 2011 11:50:01 +0000 (12:50 +0100)
committerOlivier Goffart <olivier.goffart@nokia.com>
Wed, 23 Feb 2011 11:50:01 +0000 (12:50 +0100)
commit5a2f7b97d564e4b8a9619cd7aa1519b4dd084ae8
tree7886477c9d38d8c07008e12abf2eb6e05ed672e3tree | snapshot
parentca7be48b7a150952a9657d1000941fb986e5bb2bcommit | diff
parent33f0f832a243ee2cb188fcf27126bde6c6c883b0commit | diff
Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7

Conflicts:
src/gui/kernel/qcocoaview_mac.mm
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
src/testlib/qtestcase.cpp
19 files changed:
mkspecs/features/qt_functions.prf diff1 | diff2 | blob | history
src/dbus/qdbusdemarshaller.cpp diff1 | diff2 | blob | history
src/declarative/graphicsitems/qdeclarativeflickable.cpp diff1 | diff2 | blob | history
src/declarative/util/qdeclarativeanimation.cpp diff1 | diff2 | blob | history
src/declarative/util/qdeclarativeanimation_p_p.h diff1 | diff2 | blob | history
src/declarative/util/qdeclarativexmllistmodel.cpp diff1 | diff2 | blob | history
src/gui/itemviews/qtreeview.cpp diff1 | diff2 | blob | history
src/gui/kernel/qcocoasharedwindowmethods_mac_p.h diff1 | diff2 | blob | history
src/gui/kernel/qcocoaview_mac.mm diff1 | diff2 | blob | history
src/gui/kernel/qt_cocoa_helpers_mac.mm diff1 | diff2 | blob | history
src/gui/painting/qpaintengine_raster.cpp diff1 | diff2 | blob | history
src/gui/text/qtextcontrol.cpp diff1 | diff2 | blob | history
src/gui/widgets/qlinecontrol.cpp diff1 | diff2 | blob | history
src/network/access/qnetworkrequest.cpp diff1 | diff2 | blob | history
src/testlib/qtestcase.cpp diff1 | diff2 | blob | history
src/testlib/qtestlog_p.h diff1 | diff2 | blob | history
tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp diff1 | diff2 | blob | history
tests/auto/qfuturewatcher/tst_qfuturewatcher.cpp diff1 | diff2 | blob | history
tests/auto/qpainter/tst_qpainter.cpp diff1 | diff2 | blob | history
6b46b7419a5aee9bd5fce67b7bfa8afe8e