diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-04-18 16:31:19 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-04-18 16:31:19 (GMT) |
| commit | fda9cc1d8a0e49817d1c6192c52d18dffcecf327 (patch) | |
| tree | aa9a3209339af6882eb496ab827f5ac297452d66 /qmake/generators/metamakefile.cpp | |
| parent | 6814998ab4d9c6b0990b0bf01119ace69363ce3e (diff) | |
| parent | c8aafe9a63b13a4af3049c43fcd5e8cce27db829 (diff) | |
| download | Qt-fda9cc1d8a0e49817d1c6192c52d18dffcecf327.zip Qt-fda9cc1d8a0e49817d1c6192c52d18dffcecf327.tar.gz Qt-fda9cc1d8a0e49817d1c6192c52d18dffcecf327.tar.bz2 | |
Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
qmake/generators/makefile.cpp
qmake/generators/win32/msbuild_objectmodel.cpp
qmake/generators/win32/msvc_vcxproj.cpp
src/corelib/global/qnamespace.h
src/gui/text/qtextcontrol.cpp
Diffstat (limited to 'qmake/generators/metamakefile.cpp')
0 files changed, 0 insertions, 0 deletions