79f2480c86
Conflicts: src/corelib/kernel/qmetaobject.cpp src/corelib/kernel/qvariant.cpp src/tools/moc/moc.h Change-Id: I2cd3d95b41d2636738c6b98064864941e3b0b4e6 |
||
|---|---|---|
| bin | ||
| config.tests | ||
| dist | ||
| doc/src | ||
| examples | ||
| lib | ||
| mkspecs | ||
| qmake | ||
| src | ||
| tests | ||
| tools | ||
| util | ||
| .gitattributes | ||
| .gitignore | ||
| .tag | ||
| configure | ||
| configure.bat | ||
| header.BSD | ||
| header.FDL | ||
| header.LGPL | ||
| header.LGPL-ONLY | ||
| INSTALL | ||
| LGPL_EXCEPTION.txt | ||
| LICENSE.FDL | ||
| LICENSE.LGPL | ||
| LICENSE.PREVIEW.COMMERCIAL | ||
| qtbase.pro | ||
| sync.profile | ||