diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-06 08:51:08 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-06 08:51:08 (GMT) |
| commit | 2dc7fae7ea38a0169c4c5c78d0534d688347aacb (patch) | |
| tree | a32a448270ccd835b1aa670f2cfbbb98eecf2738 /tests/auto/qwidget | |
| parent | f1ea73bad48816222e192a95f8589493743f0c28 (diff) | |
| parent | 7851cbd64d15d39a0e9cc99efa6c2d007c935ce9 (diff) | |
| download | Qt-2dc7fae7ea38a0169c4c5c78d0534d688347aacb.zip Qt-2dc7fae7ea38a0169c4c5c78d0534d688347aacb.tar.gz Qt-2dc7fae7ea38a0169c4c5c78d0534d688347aacb.tar.bz2 | |
Merge branch '4.5' into 4.6
Conflicts:
src/corelib/global/qglobal.h
src/plugins/qpluginbase.pri
src/qbase.pri
tests/auto/qabstractitemview/tst_qabstractitemview.cpp
tests/auto/qcssparser/qcssparser.pro
tools/assistant/tools/assistant/doc/assistant.qdocconf
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qmake.qdocconf
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf
Diffstat (limited to 'tests/auto/qwidget')
0 files changed, 0 insertions, 0 deletions