Conflicts: mkspecs/features/moc.prf Change-Id: Ia71c8e3b3185f7c999bf226d0675051b10b8740b |
||
|---|---|---|
| .. | ||
| qfactoryloader | ||
| qlibrary | ||
| qplugin | ||
| qpluginloader | ||
| quuid | ||
| plugin.pro | ||
Conflicts: mkspecs/features/moc.prf Change-Id: Ia71c8e3b3185f7c999bf226d0675051b10b8740b |
||
|---|---|---|
| .. | ||
| qfactoryloader | ||
| qlibrary | ||
| qplugin | ||
| qpluginloader | ||
| quuid | ||
| plugin.pro | ||