Conflicts:
src/corelib/Qt5CoreConfigExtras.cmake.in
src/corelib/Qt5CoreMacros.cmake
src/dbus/Qt5DBusConfigExtras.cmake.in
src/widgets/Qt5WidgetsConfigExtras.cmake.in
Change-Id: Ib782f3b177c38b2cce83beebe15be9c0baa578f7
|
||
|---|---|---|
| .. | ||
| CMakeLists.txt | ||
| cborconverter.cpp | ||
| cborconverter.h | ||
| convert.pro | ||
| converter.h | ||
| datastreamconverter.cpp | ||
| datastreamconverter.h | ||
| jsonconverter.cpp | ||
| jsonconverter.h | ||
| main.cpp | ||
| nullconverter.cpp | ||
| nullconverter.h | ||
| textconverter.cpp | ||
| textconverter.h | ||
| xmlconverter.cpp | ||
| xmlconverter.h | ||