projects / qt:qt.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8592bcc 7e4a918)
Merge remote branch 'origin/4.8' into qa-review-master
authorRohan McGovern <rohan.mcgovern@nokia.com>
Sun, 15 May 2011 23:09:31 +0000 (09:09 +1000)
committerRohan McGovern <rohan.mcgovern@nokia.com>
Sun, 15 May 2011 23:09:31 +0000 (09:09 +1000)
commit5aa1cbcdacd19b2e526e358eddac1b7d55a994b5
tree4aba78405e3d98081662fcb934f673acd1b79d42tree | snapshot
parent8592bcc80b7ec245b485fa54f8bd41c4484e93e0commit | diff
parent7e4a9187bb11b794e45d95d2e9fae026d6b0d07dcommit | diff
Merge remote branch 'origin/4.8' into qa-review-master

Conflicts:
tests/auto/qaccessibility/tst_qaccessibility.cpp
tests/auto/qsslsocket/tst_qsslsocket.cpp
24 files changed:
qmake/generators/makefile.cpp diff1 | diff2 | blob | history
tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp diff1 | diff2 | blob | history
tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp diff1 | diff2 | blob | history
tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp diff1 | diff2 | blob | history
tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp diff1 | diff2 | blob | history
tests/auto/qaccessibility/tst_qaccessibility.cpp diff1 | diff2 | blob | history
tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp diff1 | diff2 | blob | history
tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp diff1 | diff2 | blob | history
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp diff1 | diff2 | blob | history
tests/auto/qlocale/tst_qlocale.cpp diff1 | diff2 | blob | history
tests/auto/qmetaobject/tst_qmetaobject.cpp diff1 | diff2 | blob | history
tests/auto/qmutex/tst_qmutex.cpp diff1 | diff2 | blob | history
tests/auto/qnetworkreply/tst_qnetworkreply.cpp diff1 | diff2 | blob | history
tests/auto/qobject/tst_qobject.cpp diff1 | diff2 | blob | history
tests/auto/qpixmap/tst_qpixmap.cpp diff1 | diff2 | blob | history
tests/auto/qscriptengine/tst_qscriptengine.cpp diff1 | diff2 | blob | history
tests/auto/qsslsocket/tst_qsslsocket.cpp diff1 | diff2 | blob | history
tests/auto/qstring/tst_qstring.cpp diff1 | diff2 | blob | history
tests/auto/qtextboundaryfinder/tst_qtextboundaryfinder.cpp diff1 | diff2 | blob | history
tests/auto/qtextedit/tst_qtextedit.cpp diff1 | diff2 | blob | history
tests/auto/qthread/tst_qthread.cpp diff1 | diff2 | blob | history
tests/auto/qvariant/tst_qvariant.cpp diff1 | diff2 | blob | history
tests/auto/qwizard/tst_qwizard.cpp diff1 | diff2 | blob | history
tests/auto/qxmlquery/tst_qxmlquery.cpp diff1 | diff2 | blob | history
6b46b7419a5aee9bd5fce67b7bfa8afe8e