Conflicts: .qmake.conf examples/widgets/widgets/imageviewer/imageviewer.cpp src/corelib/text/qchar.cpp src/corelib/time/qdatetime.cpp Change-Id: I9762f5c4ff650799219729d6aee79ac07ce9024a |
||
|---|---|---|
| .. | ||
| imageviewer.cpp | ||
| imageviewer.h | ||
| imageviewer.pro | ||
| main.cpp | ||
Conflicts: .qmake.conf examples/widgets/widgets/imageviewer/imageviewer.cpp src/corelib/text/qchar.cpp src/corelib/time/qdatetime.cpp Change-Id: I9762f5c4ff650799219729d6aee79ac07ce9024a |
||
|---|---|---|
| .. | ||
| imageviewer.cpp | ||
| imageviewer.h | ||
| imageviewer.pro | ||
| main.cpp | ||