Conflicts:
src/corelib/Qt5CoreConfigExtras.cmake.in
src/corelib/Qt5CoreMacros.cmake
src/dbus/Qt5DBusConfigExtras.cmake.in
src/widgets/Qt5WidgetsConfigExtras.cmake.in
Change-Id: Ib782f3b177c38b2cce83beebe15be9c0baa578f7
|
||
|---|---|---|
| .. | ||
| moc | ||
| qdbuscpp2xml | ||
| qdbusxml2cpp | ||
| qmake | ||
| qmakelib | ||
| rcc | ||
| uic | ||
| CMakeLists.txt | ||
| tools.pro | ||