projects / qt:qt.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cb4eb59 ec65433)
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
authorLiang Qi <liang.qi@nokia.com>
Tue, 25 Oct 2011 12:56:51 +0000 (14:56 +0200)
committerLiang Qi <liang.qi@nokia.com>
Tue, 25 Oct 2011 12:56:51 +0000 (14:56 +0200)
commitbd0258ed73ecee28fba4c21027b2c2afd1b6af39
tree136e780c13e0019382a315758d20e8ea43cf1c2dtree | snapshot
parentcb4eb590d4af9978a0d60402f3c4ab99b6f4ede4commit | diff
parentec6543371108bbe24fb8d98eb1ff057c641a0e9dcommit | diff
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
src/corelib/kernel/qeventdispatcher_symbian.cpp
src/declarative/qml/qdeclarativetypeloader.cpp
src/imports/gestures/gestures.pro
src/imports/particles/particles.pro
src/opengl/qgl.cpp
src/opengl/qgl_p.h
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
tests/auto/declarative/qdeclarativescriptdebugging/qdeclarativescriptdebugging.pro
tests/auto/declarative/qdeclarativewebview/qdeclarativewebview.pro
tests/auto/qaudioinput/qaudioinput.pro
tests/auto/qaudiooutput/qaudiooutput.pro
tests/auto/qchar/qchar.pro
tests/auto/qclipboard/test/test.pro
tests/auto/qsound/qsound.pro
26 files changed:
src/corelib/kernel/qeventdispatcher_symbian.cpp diff1 | diff2 | blob | history
src/corelib/kernel/qtranslator.cpp diff1 | diff2 | blob | history
src/declarative/graphicsitems/qdeclarativegridview.cpp diff1 | diff2 | blob | history
src/declarative/graphicsitems/qdeclarativelistview.cpp diff1 | diff2 | blob | history
src/declarative/qml/qdeclarativedirparser.cpp diff1 | diff2 | blob | history
src/declarative/qml/qdeclarativedirparser_p.h diff1 | diff2 | blob | history
src/declarative/qml/qdeclarativeimport.cpp diff1 | diff2 | blob | history
src/declarative/qml/qdeclarativetypeloader.cpp diff1 | diff2 | blob | history
src/gui/inputmethod/qcoefepinputcontext_p.h diff1 | diff2 | blob | history
src/gui/inputmethod/qcoefepinputcontext_s60.cpp diff1 | diff2 | blob | history
src/gui/kernel/qapplication.cpp diff1 | diff2 | blob | history
src/gui/kernel/qapplication.h diff1 | diff2 | blob | history
src/gui/kernel/qapplication_p.h diff1 | diff2 | blob | history
src/gui/kernel/qapplication_s60.cpp diff1 | diff2 | blob | history
src/imports/folderlistmodel/folderlistmodel.pro diff1 | diff2 | blob | history
src/imports/gestures/gestures.pro diff1 | diff2 | blob | history
src/imports/particles/particles.pro diff1 | diff2 | blob | history
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp diff1 | diff2 | blob | history
src/opengl/qgl.cpp diff1 | diff2 | blob | history
src/opengl/qgl_egl.cpp diff1 | diff2 | blob | history
src/opengl/qgl_p.h diff1 | diff2 | blob | history
src/s60installs/bwins/QtGuiu.def diff1 | diff2 | blob | history
src/s60installs/eabi/QtGuiu.def diff1 | diff2 | blob | history
tests/auto/qclipboard/test/test.pro diff1 | diff2 | blob | history
tests/auto/qfileinfo/qfileinfo.pro diff1 | diff2 | blob | history
tests/auto/qlocalsocket/test/test.pro diff1 | diff2 | blob | history
6b46b7419a5aee9bd5fce67b7bfa8afe8e