diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-30 16:17:55 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-30 16:19:21 (GMT) |
| commit | e1edc775a5fdfd0e9e940abcc5050944eb396f8b (patch) | |
| tree | 85efff1a422adb9e6eedf1b68eb994b5ad564d60 /qmake | |
| parent | 359e6ae3900930656b7359210105426a1771bf19 (diff) | |
| download | Qt-e1edc775a5fdfd0e9e940abcc5050944eb396f8b.zip Qt-e1edc775a5fdfd0e9e940abcc5050944eb396f8b.tar.gz Qt-e1edc775a5fdfd0e9e940abcc5050944eb396f8b.tar.bz2 | |
Fix bad merge from 4.6.
Revert qgraphicsview.h to its prior 4.7 state and symbian.conf to
the current qt-4.7-from-4.6 (7c613a9ef4610fa2e0e1630eb3cd2b474875631d)
state.
symbian.conf may be bad, needs reviewing.
Diffstat (limited to 'qmake')
0 files changed, 0 insertions, 0 deletions