Conflicts: dependencies.yaml src/qml/qml/qqmlengine.cpp Change-Id: I6a73fd1064286f4a2232de85c2ce7f80452d4641 |
||
---|---|---|
.. | ||
CMakeLists.txt | ||
app.qml | ||
chapter1-basics.pro | ||
chapter1-basics.qrc | ||
main.cpp | ||
piechart.cpp | ||
piechart.h |
Conflicts: dependencies.yaml src/qml/qml/qqmlengine.cpp Change-Id: I6a73fd1064286f4a2232de85c2ce7f80452d4641 |
||
---|---|---|
.. | ||
CMakeLists.txt | ||
app.qml | ||
chapter1-basics.pro | ||
chapter1-basics.qrc | ||
main.cpp | ||
piechart.cpp | ||
piechart.h |