diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-10-05 14:05:00 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-10-05 14:05:00 (GMT) |
| commit | c743e81790213db0c9a4abcee993fce0368b6367 (patch) | |
| tree | 4eeaa5fd21f18981f8e31a3288da92d3e2084ead /mkspecs/features/dbusadaptors.prf | |
| parent | d9f42e554c1da7aafad59881e1d143ff8672b833 (diff) | |
| parent | a7bf1cfb1a75c35e837c01f4a5b0697fc8961148 (diff) | |
| download | Qt-c743e81790213db0c9a4abcee993fce0368b6367.zip Qt-c743e81790213db0c9a4abcee993fce0368b6367.tar.gz Qt-c743e81790213db0c9a4abcee993fce0368b6367.tar.bz2 | |
Merge remote branch 'qt/4.7' into lighthouse-4.7
Conflicts:
src/gui/painting/qpdf.cpp
Diffstat (limited to 'mkspecs/features/dbusadaptors.prf')
0 files changed, 0 insertions, 0 deletions