Conflicts: config.tests/unix/compile.test src/plugins/platforms/cocoa/qcocoahelpers.mm src/tools/qlalr/cppgenerator.cpp Change-Id: I0103ca076a9aca7118b2fd99f0fdaf81055998c3 |
||
|---|---|---|
| .. | ||
| almostplugin | ||
| elftest | ||
| lib | ||
| machtest | ||
| theplugin | ||
| tst | ||
| .gitignore | ||
| empty.json | ||
| fakeplugin.cpp | ||
| qpluginloader.pro | ||
| tst_qpluginloader.cpp | ||
| winrt.pri | ||