Conflicts:
src/corelib/Qt5CoreConfigExtras.cmake.in
src/corelib/Qt5CoreMacros.cmake
src/dbus/Qt5DBusConfigExtras.cmake.in
src/widgets/Qt5WidgetsConfigExtras.cmake.in
Change-Id: Ib782f3b177c38b2cce83beebe15be9c0baa578f7
|
||
|---|---|---|
| .. | ||
| inifiles | ||
| CMakeLists.txt | ||
| locationdialog.cpp | ||
| locationdialog.h | ||
| main.cpp | ||
| mainwindow.cpp | ||
| mainwindow.h | ||
| settingseditor.pro | ||
| settingstree.cpp | ||
| settingstree.h | ||
| variantdelegate.cpp | ||
| variantdelegate.h | ||