Conflicts: src/corelib/global/qglobal.cpp src/corelib/global/qlogging.cpp src/gui/kernel/qguiapplication.h src/gui/kernel/qwindow.cpp src/gui/kernel/qwindow.h tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp Change-Id: I62a8805577a7940d4d36bed985eb3e7019d22f2e |
||
|---|---|---|
| .. | ||
| stream | ||
| .gitignore | ||
| qvariant.pro | ||
| qvariant.qrc | ||
| tst_qvariant.cpp | ||