Liang Qi 683e144efb Merge remote-tracking branch 'origin/5.11' into 5.12 ... Conflicts: mkspecs/common/macx.conf Change-Id: I8576493b417912fa5e5501bc2c1b935d186ac209		2018-09-10 12:12:46 +02:00
..
android	…
bic/data	Add binary compatibility files for 5.11 for QtBase	2018-06-05 06:00:28 +00:00
cmake	Merge dev into 5.12	2018-08-21 02:32:50 +02:00
concurrent	Merge remote-tracking branch 'origin/5.11' into dev	2018-02-16 08:54:58 +01:00
corelib	moc: Fix compilation of text strings containing non-ASCII	2018-09-10 04:17:03 +00:00
dbus	Fix wrong relative path to qdbus_symbols.cpp	2018-07-24 04:24:31 +00:00
gui	Fix QSIM::itemData returning role 255	2018-09-06 11:51:28 +00:00
guiapplauncher	…
installed_cmake	…
network	tst_qdtls: add 'invalidConfiguration' test	2018-08-10 12:18:41 +00:00
opengl	tst_qglthreads::swapInThread(): Acquire context before resizing widget	2018-09-06 12:42:06 +00:00
other	Disable tst_macnativeevents	2018-08-31 12:35:45 +00:00
printsupport	Merge remote-tracking branch 'origin/5.11' into dev	2018-05-03 14:50:22 +02:00
shared	…
sql	Initialize the QSqlQuery to be invalid when creating a sql model	2018-08-28 16:10:30 +00:00
testlib	Merge remote-tracking branch 'origin/5.11' into dev	2018-07-02 11:23:45 +02:00
tools	uic: Fix pixmap functions for QIcon	2018-09-06 11:58:40 +00:00
widgets	Merge remote-tracking branch 'origin/5.11' into 5.12	2018-09-10 12:12:46 +02:00
xml	…
auto.pro	winrt: Skip network auto tests for now	2018-06-22 05:02:39 +00:00
network-settings.h	Rework QNetworkReply tests to use docker-based test servers	2018-07-27 17:40:27 +00:00
testserver.pri	Postpone testing docker images and files until running 'make check'	2018-08-30 04:06:51 +00:00