99cdd5fc67
Conflicts: src/corelib/global/qrandom.cpp src/corelib/io/qfileinfo.cpp src/corelib/kernel/qeventdispatcher_win.cpp src/corelib/kernel/qeventdispatcher_win_p.h src/gui/text/qfontdatabase.cpp src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm src/plugins/platforms/windows/qwindowsglcontext.cpp src/testlib/qtestcase.cpp Done-With: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Done-With: Edward Welbourne <edward.welbourne@qt.io> Change-Id: I4893212471aa24be804c989a581810e2f714545c |
||
---|---|---|
.. | ||
dragwidget.cpp | ||
dragwidget.h | ||
highdpi.pro | ||
highdpi.qrc | ||
main.cpp | ||
qticon16.png | ||
qticon16@2x.png | ||
qticon16@3x.png | ||
qticon32.png | ||
qticon32@2x.png | ||
qticon64.png |