Paul Olav Tvete 2f52e1da0d Merge remote-tracking branch 'qt/5.12' into 5.13 ... Conflicts: src/gui/configure.json src/gui/util/qtexturefilereader.cpp src/gui/util/util.pri tests/auto/gui/util/qtexturefilereader/tst_qtexturefilereader.cpp Change-Id: I2bc4f84705b66099e97330cda68e0b816aceb9cc		2019-08-20 10:41:56 +00:00
..
moc	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-05-12 01:00:08 +02: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	Fix qinstall on Windows for directories containing read-only files	2019-08-15 09:24:14 +02:00
qmakelib	qmake: add $$read_registry() function	2019-01-05 20:33:07 +00:00
rcc	Resources: reject compressed content we can't decompress	2018-12-12 16:36:09 +00:00
uic	uic: Fix broken icon code generation	2019-01-23 17:06:59 +00:00
tools.pro