projects / qt:qt.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 09ce407 00f7426)
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
authorDavid Boddie <dboddie@trolltech.com>
Tue, 30 Mar 2010 14:56:41 +0000 (16:56 +0200)
committerDavid Boddie <dboddie@trolltech.com>
Tue, 30 Mar 2010 14:56:41 +0000 (16:56 +0200)
commit87f66d52e362de003a9f2cdaafbfbe3ba4e5fbc3
treef8b8c24056d54e19937dea1b0301af558597726atree | snapshot
parent09ce407aaa4a00013a606bf0011faf6cbc654c72commit | diff
parent00f7426f3906361fb5addb36e428648eee5e2983commit | diff
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7

Conflicts:

doc/src/modules.qdoc
mkspecs/common/symbian/symbian.conf
src/gui/graphicsview/qgraphicswidget.h
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
22 files changed:
doc/src/frameworks-technologies/activeqt.qdoc diff1 | diff2 | blob | history
doc/src/modules.qdoc diff1 | diff2 | blob | history
qmake/generators/symbian/symmake.cpp diff1 | diff2 | blob | history
src/3rdparty/webkit/WebCore/plugins/symbian/PluginViewSymbian.cpp diff1 | diff2 | blob | history
src/corelib/tools/qchar.cpp diff1 | diff2 | blob | history
src/gui/dialogs/qfilesystemmodel.cpp diff1 | diff2 | blob | history
src/gui/dialogs/qmessagebox.cpp diff1 | diff2 | blob | history
src/gui/graphicsview/qgraphicsitem.cpp diff1 | diff2 | blob | history
src/gui/graphicsview/qgraphicsscene.cpp diff1 | diff2 | blob | history
src/gui/graphicsview/qgraphicswidget.cpp diff1 | diff2 | blob | history
src/gui/kernel/qwidget_p.h diff1 | diff2 | blob | history
src/gui/styles/qgtkstyle.cpp diff1 | diff2 | blob | history
src/gui/styles/qs60style_s60.cpp diff1 | diff2 | blob | history
src/gui/text/qfontdatabase_s60.cpp diff1 | diff2 | blob | history
src/gui/text/qfontengine_win.cpp diff1 | diff2 | blob | history
src/opengl/qgl_p.h diff1 | diff2 | blob | history
src/openvg/qpaintengine_vg.cpp diff1 | diff2 | blob | history
src/openvg/qpixmapdata_vg.cpp diff1 | diff2 | blob | history
src/sql/drivers/odbc/qsql_odbc.cpp diff1 | diff2 | blob | history
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp diff1 | diff2 | blob | history
tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp diff1 | diff2 | blob | history
tests/auto/qnetworkreply/tst_qnetworkreply.cpp diff1 | diff2 | blob | history
6b46b7419a5aee9bd5fce67b7bfa8afe8e