Liang Qi e918334045 Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/widgets/dialogs/qcolordialog.cpp src/widgets/dialogs/qfiledialog.cpp tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp Change-Id: I34bc8a990f8f526889a95a5c7099ef557b9681ad		2016-09-28 11:51:35 +02:00
..
testdata/paintEvent	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00
.gitignore	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00
BLACKLIST	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-05-19 12:55:27 +02:00
geometry-fullscreen.dat	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00
geometry-maximized.dat	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00
geometry.dat	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00
qwidget.pro	fix usage of wince scope	2015-06-05 10:29:10 +00:00
qwidget.qrc	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00
tst_qwidget_mac_helpers.h	Updated license headers	2016-01-21 18:55:18 +00:00
tst_qwidget_mac_helpers.mm	Updated license headers	2016-01-21 18:55:18 +00:00
tst_qwidget.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-09-28 11:51:35 +02:00