Conflicts: src/widgets/widgets/qpushbutton.cpp Change-Id: I615de00e6e64540c50f658d4d8ab3e002d701a81 |
||
|---|---|---|
| .. | ||
| baseline | ||
| .gitignore | ||
| tst_uic.cpp | ||
| uic.pro | ||
Conflicts: src/widgets/widgets/qpushbutton.cpp Change-Id: I615de00e6e64540c50f658d4d8ab3e002d701a81 |
||
|---|---|---|
| .. | ||
| baseline | ||
| .gitignore | ||
| tst_uic.cpp | ||
| uic.pro | ||