summaryrefslogtreecommitdiff
path: root/tests/auto/qsettings/tst_qsettings.cpp
diff options
context:
space:
mode:
authorJyri Tahtela <jyri.tahtela@nokia.com>2011-05-13 14:30:46 +0300
committerJyri Tahtela <jyri.tahtela@nokia.com>2011-05-13 14:30:46 +0300
commit50ea2454c0ad9b28be6dd5125c74466f0f96d16a (patch)
tree610e8b4852bca7d23ec5c4b9937a119eed96a124 /tests/auto/qsettings/tst_qsettings.cpp
parent0f750aec4507fffc06acea46a513c6d374564d6a (diff)
parenta80130b07c5b8ee4b06eabbceb65eb23d4d4602e (diff)
downloadqt4-tools-50ea2454c0ad9b28be6dd5125c74466f0f96d16a.tar.gz
Merge remote-tracking branch 'qt/4.8'
Conflicts: src/s60installs/eabi/QtOpenGLu.def
Diffstat (limited to 'tests/auto/qsettings/tst_qsettings.cpp')
0 files changed, 0 insertions, 0 deletions