ee71a9ba81
Conflicts: src/network/ssl/qsslsocket.cpp src/widgets/kernel/qapplication.cpp Change-Id: Ib7421cc2df59d0969f89b3fbd65a17ea76ffef3b |
||
---|---|---|
.. | ||
.gitignore | ||
qitemselectionmodel.pro | ||
tst_qitemselectionmodel.cpp |
ee71a9ba81
Conflicts: src/network/ssl/qsslsocket.cpp src/widgets/kernel/qapplication.cpp Change-Id: Ib7421cc2df59d0969f89b3fbd65a17ea76ffef3b |
||
---|---|---|
.. | ||
.gitignore | ||
qitemselectionmodel.pro | ||
tst_qitemselectionmodel.cpp |