Conflicts: src/plugins/styles/mac/qmacstyle_mac.mm src/widgets/util/qcompleter.cpp src/widgets/widgets/qmainwindowlayout.cpp src/widgets/widgets/qmdisubwindow.cpp Change-Id: If0e96981af07ce36ac68f2e69211bc2120f93973 |
||
|---|---|---|
| .. | ||
| testdata | ||
| .gitignore | ||
| qsqldatabase.pro | ||
| tst_databases.h | ||
| tst_qsqldatabase.cpp | ||