diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-15 02:31:44 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-15 02:31:44 (GMT) |
| commit | 05ab8ad1577fc038aa2b3bd96cedda54e6a64979 (patch) | |
| tree | ec0989e1267bdd518040147680e7567ee39931c8 /qmake/generators/makefile.cpp | |
| parent | 4ef087e5ecd19286b6f43b07f4e47da4f1ae036f (diff) | |
| parent | a2c73d3f0305847343d5015c095073eae0ead197 (diff) | |
| download | Qt-05ab8ad1577fc038aa2b3bd96cedda54e6a64979.zip Qt-05ab8ad1577fc038aa2b3bd96cedda54e6a64979.tar.gz Qt-05ab8ad1577fc038aa2b3bd96cedda54e6a64979.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Rename "interface" in qdeclarativeinterface.h to "qmlInterface"
Diffstat (limited to 'qmake/generators/makefile.cpp')
0 files changed, 0 insertions, 0 deletions