whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/src/corelib/json
History
Liang Qi 1cc571593a Merge remote-tracking branch 'origin/5.7' into 5.8 
cf53aa21bf and 3aaa5d6b32
were reverted because of reconstruction in 5.7.

defineTest(qtConfTest_checkCompiler) in configure.pri is smart
enough to cover the case in a9474d1260.

DirectWrite: Fix advances being scaled to 0

Since 131eee5cd, the stretch of a font can be 0, meaning
"whatever the font provides". In combination with ec7fee96,
this would cause advances in the DirectWrite engine to be scaled to
0, causing the QRawFont test to fail.

Conflicts:
	configure
	mkspecs/features/uikit/device_destinations.sh
	mkspecs/features/uikit/xcodebuild.mk
	src/corelib/global/qglobal.cpp
	src/corelib/global/qnamespace.qdoc
	src/plugins/platforms/cocoa/qcocoamenuitem.h
	src/plugins/platforms/windows/qwindowsservices.cpp
	src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp
	src/plugins/platforms/windows/qwindowsfontenginedirectwrite.cpp
	src/widgets/kernel/qapplication.cpp
	tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
	tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp

Change-Id: I4656d8133da7ee9fcc84ad3f1c7950f924432d1e
 		2016-08-29 15:30:17 +02:00
..
json.pri Import json support from playground/qtbinaryjson 2012-01-24 15:28:20 +01:00
qjson.cpp Support C++17 fallthrough attribute 2016-08-19 18:38:53 +00:00
qjson_p.h Merge remote-tracking branch 'origin/5.7' into 5.8 2016-08-29 15:30:17 +02:00
qjsonarray.cpp Merge remote-tracking branch 'origin/5.6' into 5.7 2016-02-18 20:50:35 +01:00
qjsonarray.h Merge remote-tracking branch 'origin/5.6' into 5.7 2016-02-18 20:50:35 +01:00
qjsondocument.cpp Merge remote-tracking branch 'origin/5.7' into dev 2016-07-19 20:14:40 +02:00
qjsondocument.h Updated license headers 2016-01-15 12:25:24 +00:00
qjsonobject.cpp Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-10 23:27:10 +02:00
qjsonobject.h QJsonObject: add some overloads taking QLatin1String 2016-05-10 21:18:46 +00:00
qjsonparser.cpp Use void instead of uchar in the endian-swapping function parameters 2016-05-26 18:02:49 +00:00
qjsonparser_p.h Make sure all private headers in Qt Core include qglobal_p.h 2016-06-25 08:01:04 +00:00
qjsonvalue.cpp QJsonValue::toVariant(): Differentiate between null and invalid 2016-08-05 14:53:33 +00:00
qjsonvalue.h Merge remote-tracking branch 'origin/5.6' into 5.7 2016-08-18 11:07:51 +02:00
qjsonwriter.cpp Update the Intel copyright year 2016-01-21 22:44:16 +00:00
qjsonwriter_p.h Make sure all private headers in Qt Core include qglobal_p.h 2016-06-25 08:01:04 +00:00