Conflicts: src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm src/plugins/platforms/qnx/qqnxrasterbackingstore.cpp tools/configure/configureapp.cpp Change-Id: I3092bd3276af14304b7ab3ae1e1cc05d11cdede0 |
||
|---|---|---|
| .. | ||
| stream | ||
| .gitignore | ||
| qvariant.pro | ||
| qvariant.qrc | ||
| tst_qvariant.cpp | ||