Conflicts:
src/corelib/tools/qlocale_data_p.h
(Regenerated by running the scripts in util/local_database/)
src/gui/opengl/qopengltextureuploader.cpp
Done-With: Edward Welbourne <edward.welbourne@qt.io>
Done-With: Allan Sandfeld Jensen <allan.jensen@qt.io>
Change-Id: I12df7f066ed0a25eb109f61c4b8d8dea63b683e2
|
||
|---|---|---|
| .. | ||
| accessibilityinspector | ||
| aglfn | ||
| corelib/qurl-generateTLDs | ||
| edid | ||
| glgen | ||
| gradientgen | ||
| harfbuzz | ||
| includemocs | ||
| integrity | ||
| lexgen | ||
| local_database | ||
| plugintest | ||
| unicode | ||
| x86simdgen | ||
| xkbdatagen | ||