whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/tests/auto/tools
History
Qt Forward Merge Bot 558fc903ac Merge remote-tracking branch 'origin/5.15' into dev 
Conflicts:
	src/corelib/io/qsettings.cpp
	src/corelib/kernel/qvariant.cpp
	src/corelib/serialization/qjsoncbor.cpp
	src/corelib/serialization/qjsonvalue.cpp
	src/corelib/tools/tools.pri
	src/gui/image/qimage.cpp
	src/gui/kernel/qguivariant.cpp
	src/widgets/kernel/qshortcut.cpp
	tests/auto/tools/moc/allmocs_baseline_in.json
	tests/auto/tools/moc/tst_moc.cpp
        src/opengl/qglframebufferobject.cpp

Done-With: Edward Welbourne <edward.welbourne@qt.io>
Done-With: Leander Beernaert <leander.beernaert@qt.io>
Change-Id: Ie7f5fa646c607fe70c314bf7195f7578ded1d271
 		2020-01-28 14:14:20 +00:00
..
moc Merge remote-tracking branch 'origin/5.15' into dev 2020-01-28 14:14:20 +00:00
qdbuscpp2xml remove unnecessary references to $$QMAKE_CFLAGS_DBUS 2016-10-04 20:21:28 +00:00
qdbusxml2cpp remove unnecessary references to $$QMAKE_CFLAGS_DBUS 2016-10-04 20:21:28 +00:00
qmake Make conflicting targets check less strict 2019-10-03 20:28:03 +02:00
qmakelib Migrate Windows system libs to external dependencies 2019-05-08 08:30:02 +00:00
rcc rcc: Add -d option to output a Makefile-syntax depfile 2019-06-29 02:26:23 +02:00
uic uic/Python: Fix missing QCursor import 2020-01-14 14:17:52 +01:00
tools.pro
…