dd756011da
Conflicts: configure.json mkspecs/win32-icc/qmake.conf Change-Id: Ibf40546b024d644c7d9ed490bee15b82597f4d3f |
||
---|---|---|
.. | ||
.gitattributes | ||
.gitignore | ||
BLACKLIST | ||
bom.ini | ||
qsettings.pro | ||
qsettings.qrc | ||
resourcefile2.ini | ||
resourcefile3.ini | ||
resourcefile4.ini | ||
resourcefile5.ini | ||
resourcefile6.plist | ||
resourcefile.ini | ||
tst_qsettings.cpp |