diff options
| author | Thomas Zander <t.zander@nokia.com> | 2010-09-28 11:44:45 (GMT) |
|---|---|---|
| committer | Thomas Zander <t.zander@nokia.com> | 2010-09-28 11:44:45 (GMT) |
| commit | 5c08412285f14d89174aef1190a1de1c35fd62bd (patch) | |
| tree | 2e9bef2fdf0af18db76b011cd9c4ed4b456f507c /tests/auto/declarative/qdeclarativelanguage/data/component.6.qml | |
| parent | 2645784f05db7b1e631621c511e94c88fc5cd211 (diff) | |
| parent | 2868302626b8a31f44df1068514485a89ec27171 (diff) | |
| download | Qt-5c08412285f14d89174aef1190a1de1c35fd62bd.zip Qt-5c08412285f14d89174aef1190a1de1c35fd62bd.tar.gz Qt-5c08412285f14d89174aef1190a1de1c35fd62bd.tar.bz2 | |
Merge commit 'origin/master' into fileEnginesOn47
Conflicts:
qmake/Makefile.win32
qmake/qmake.pri
src/corelib/io/qdir.cpp
src/corelib/io/qfileinfo.cpp
src/corelib/io/qfileinfo_p.h
src/corelib/io/qfsfileengine_win.cpp
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/eabi/QtGuiu.def
src/tools/bootstrap/bootstrap.pro
tests/auto/qfileinfo/tst_qfileinfo.cpp
Diffstat (limited to 'tests/auto/declarative/qdeclarativelanguage/data/component.6.qml')
0 files changed, 0 insertions, 0 deletions