Conflicts: configure mkspecs/features/qt_module_headers.prf mkspecs/features/qt_tool.prf src/angle/angle.pro src/tools/bootstrap/bootstrap.pro tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp Change-Id: Ide5759fe419a50f1c944211a48f7c66f662684e0 |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| double_data.h | ||
| qstring.pro | ||
| tst_qstring.cpp | ||