Conflicts:
src/corelib/Qt5CoreConfigExtras.cmake.in
src/corelib/Qt5CoreMacros.cmake
src/dbus/Qt5DBusConfigExtras.cmake.in
src/widgets/Qt5WidgetsConfigExtras.cmake.in
Change-Id: Ib782f3b177c38b2cce83beebe15be9c0baa578f7
|
||
|---|---|---|
| .. | ||
| codecs | ||
| completer | ||
| customcompleter | ||
| echoplugin | ||
| i18n | ||
| plugandpaint | ||
| regexp | ||
| regularexpression | ||
| settingseditor | ||
| styleplugin | ||
| treemodelcompleter | ||
| undo | ||
| undoframework | ||
| CMakeLists.txt | ||
| tools.pro | ||