Conflicts:
src/corelib/Qt5CoreConfigExtras.cmake.in
src/corelib/Qt5CoreMacros.cmake
src/dbus/Qt5DBusConfigExtras.cmake.in
src/widgets/Qt5WidgetsConfigExtras.cmake.in
Change-Id: Ib782f3b177c38b2cce83beebe15be9c0baa578f7
|
||
|---|---|---|
| .. | ||
| animation | ||
| codecs | ||
| global | ||
| io | ||
| itemmodels | ||
| kernel | ||
| mimetypes | ||
| plugin | ||
| serialization | ||
| statemachine | ||
| text | ||
| thread | ||
| time | ||
| tools | ||
| .prev_CMakeLists.txt | ||
| CMakeLists.txt | ||
| corelib.pro | ||