diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-24 19:08:20 +0100 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-24 19:08:20 +0100 |
| commit | 10ecfc2a444263a2fbaf2ebbf401eac62b6ff70b (patch) | |
| tree | bb19a6cdfc60d767978b711e7160bf4dc347cc60 /dist | |
| parent | d44a204988320c7c1a990536565fcb655d34db1e (diff) | |
| parent | e15d5fc7e1a82da38b765e55d040edbdf8621ae2 (diff) | |
Merge remote branch 'origin/4.7' into HEAD
Four-way merge: take the qt-qml.git#4.7 branch version (which uses
fromUtf8). I used QLatin1String, Thierry used QString::fromLatin1.
Conflicts:
src/declarative/qml/qdeclarativecompiler.cpp
Diffstat (limited to 'dist')
0 files changed, 0 insertions, 0 deletions