qt6-bb10/src/printsupport
Liang Qi 305dd1b61f Merge remote-tracking branch 'origin/5.9' into 5.11
Conflicts:
	.qmake.conf
	src/corelib/animation/qvariantanimation.cpp
	src/corelib/global/qglobal.cpp
	src/corelib/global/qlogging.cpp
	src/corelib/io/qprocess_win.cpp
	src/corelib/json/qjsonarray.cpp
	src/corelib/tools/qsimd_p.h
	src/corelib/tools/qtimezoneprivate_p.h
	src/corelib/xml/qxmlstream_p.h
	src/gui/kernel/qsimpledrag.cpp
	src/gui/kernel/qsimpledrag_p.h
	src/plugins/generic/generic.pro
	src/plugins/platforms/cocoa/qcocoamenu.mm
	src/widgets/styles/qmacstyle_mac.mm
	tests/auto/concurrent/qtconcurrentmap/BLACKLIST
	tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
	tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
	tests/auto/gui/kernel/qwindow/BLACKLIST
	tests/auto/widgets/dialogs/qmessagebox/BLACKLIST

Change-Id: I508d686cf20f7f8cc6a7119b9bc7c3bbb505c58e
2018-02-14 12:51:24 +01:00
..
dialogs cups: Clear cups options at the start of QPrintPropertiesDialog::setupPrinter 2018-01-24 21:10:09 +00:00
doc Document licenses for all Qt modules 2018-01-24 13:19:24 +00:00
kernel Remove QPlatformPrinterSupport::createDefaultPrintDevice 2018-02-05 13:53:24 +00:00
widgets Unix: Fix usability of the print properties dialog 2018-01-12 12:04:35 +00:00
configure.json Convert features.buttongroup to QT_[REQUIRE_]CONFIG 2017-09-04 07:53:34 +00:00
printsupport.pro QtConcurrent/QtOpenGL(Extensions)/QtPrintSupport/QtTestLib/QtXml: add QT_NO_FOREACH 2016-05-12 21:42:10 +00:00