082faeff9c
Conflicts: src/gui/image/qpnghandler.cpp Change-Id: I8630f363457bb613d8fb88470a71d95d97cdb301 |
||
---|---|---|
.. | ||
qcompleter | ||
qscroller | ||
qsystemtrayicon | ||
qundogroup | ||
qundostack | ||
util.pro |
082faeff9c
Conflicts: src/gui/image/qpnghandler.cpp Change-Id: I8630f363457bb613d8fb88470a71d95d97cdb301 |
||
---|---|---|
.. | ||
qcompleter | ||
qscroller | ||
qsystemtrayicon | ||
qundogroup | ||
qundostack | ||
util.pro |