Conflicts: src/corelib/io/qsavefile_p.h src/corelib/tools/qregularexpression.cpp src/gui/util/qvalidator.cpp src/gui/util/qvalidator.h Change-Id: I58fdf0358bd86e2fad5d9ad0556f3d3f1f535825 |
||
|---|---|---|
| .. | ||
| moc | ||
| qdbuscpp2xml | ||
| qdbusxml2cpp | ||
| qmake | ||
| rcc | ||
| uic | ||
| tools.pro | ||
Conflicts: src/corelib/io/qsavefile_p.h src/corelib/tools/qregularexpression.cpp src/gui/util/qvalidator.cpp src/gui/util/qvalidator.h Change-Id: I58fdf0358bd86e2fad5d9ad0556f3d3f1f535825 |
||
|---|---|---|
| .. | ||
| moc | ||
| qdbuscpp2xml | ||
| qdbusxml2cpp | ||
| qmake | ||
| rcc | ||
| uic | ||
| tools.pro | ||