Conflicts: configure.json mkspecs/win32-icc/qmake.conf Change-Id: Ibf40546b024d644c7d9ed490bee15b82597f4d3f |
||
|---|---|---|
| .. | ||
| stream | ||
| .gitignore | ||
| qvariant.pro | ||
| qvariant.qrc | ||
| tst_qvariant.cpp | ||
Conflicts: configure.json mkspecs/win32-icc/qmake.conf Change-Id: Ibf40546b024d644c7d9ed490bee15b82597f4d3f |
||
|---|---|---|
| .. | ||
| stream | ||
| .gitignore | ||
| qvariant.pro | ||
| qvariant.qrc | ||
| tst_qvariant.cpp | ||