Conflicts: qmake/generators/makefile.cpp Change-Id: Ib3715e626f2fd32804c75c16ea9aa06a1216e76d |
||
|---|---|---|
| .. | ||
| json | ||
| qcborstreamreader | ||
| qcborstreamwriter | ||
| qcborvalue | ||
| qcborvalue_json | ||
| qdatastream | ||
| qdatastream_core_pixmap | ||
| qtextstream | ||
| qxmlstream | ||
| serialization.pro | ||
Conflicts: qmake/generators/makefile.cpp Change-Id: Ib3715e626f2fd32804c75c16ea9aa06a1216e76d |
||
|---|---|---|
| .. | ||
| json | ||
| qcborstreamreader | ||
| qcborstreamwriter | ||
| qcborvalue | ||
| qcborvalue_json | ||
| qdatastream | ||
| qdatastream_core_pixmap | ||
| qtextstream | ||
| qxmlstream | ||
| serialization.pro | ||