Conflicts: src/quick/util/qquickutilmodule.cpp tools/qmllint/main.cpp Change-Id: Ic2283f88c293ca7fc776de3e83eb4c7812309d8a |
||
---|---|---|
.. | ||
main.cpp | ||
qmllint.pro |
Conflicts: src/quick/util/qquickutilmodule.cpp tools/qmllint/main.cpp Change-Id: Ic2283f88c293ca7fc776de3e83eb4c7812309d8a |
||
---|---|---|
.. | ||
main.cpp | ||
qmllint.pro |