mirror of https://github.com/qt/qtbase.git
e56d3b03ed
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
|
||
|---|---|---|
| bin | ||
| config.tests | ||
| dist | ||
| doc | ||
| examples | ||
| lib | ||
| mkspecs | ||
| qmake | ||
| src | ||
| tests | ||
| util | ||
| .gitattributes | ||
| .gitignore | ||
| .qmake.conf | ||
| .tag | ||
| INSTALL | ||
| LICENSE.FDL | ||
| LICENSE.GPL2 | ||
| LICENSE.GPL3 | ||
| LICENSE.GPL3-EXCEPT | ||
| LICENSE.LGPL3 | ||
| LICENSE.LGPLv3 | ||
| LICENSE.QT-LICENSE-AGREEMENT-4.0 | ||
| config_help.txt | ||
| configure | ||
| configure.bat | ||
| configure.json | ||
| configure.pri | ||
| header.BSD | ||
| header.COMM | ||
| header.FDL | ||
| header.GPL | ||
| header.GPL-EXCEPT | ||
| header.LGPL | ||
| header.LGPL-NOGPL2 | ||
| header.LGPL-ONLY | ||
| header.LGPL3 | ||
| header.LGPL3-COMM | ||
| header.MIT | ||
| qtbase.pro | ||
| sync.profile | ||