AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
277208c169
qt5base-lts/tests/auto/gui/painting
History
Liang Qi a732576a66 Merge remote-tracking branch 'origin/5.7' into 5.8 
Conflicts:
	config.tests/win/msvc_version.cpp
	configure.pri
	mkspecs/macx-ios-clang/features/default_post.prf
	mkspecs/macx-ios-clang/features/resolve_config.prf
	mkspecs/features/uikit/default_post.prf
	mkspecs/features/uikit/resolve_config.prf
	src/corelib/io/qsettings_mac.cpp
	src/corelib/json/qjsondocument.cpp
	src/plugins/platforms/cocoa/qcocoawindow.h
	src/plugins/platforms/cocoa/qcocoawindow.mm
	src/plugins/platforms/cocoa/qnswindowdelegate.h
	src/plugins/platforms/cocoa/qnswindowdelegate.mm
	src/plugins/platforms/ios/ios.pro
	src/plugins/platforms/ios/kernel.pro
	src/plugins/platforms/ios/qiosintegration.h
	src/plugins/platforms/minimalegl/qminimaleglintegration.cpp
	tests/auto/gui/painting/qpainter/tst_qpainter.cpp
	tools/configure/environment.cpp

Change-Id: I654845e54e40f5951fb78aab349ca667e9f27843
2016-11-01 06:02:55 +01:00
..
qbrush Updated license headers 2016-01-21 18:55:18 +00:00
qcolor Change confusing Q_DEAD_CODE_FROM_QT4_FOO define 2016-10-14 08:19:29 +00:00
qpagelayout Updated license headers 2016-01-21 18:55:18 +00:00
qpagesize Updated license headers 2016-01-21 18:55:18 +00:00
qpaintengine Updated license headers 2016-01-21 18:55:18 +00:00
qpainter Merge remote-tracking branch 'origin/5.7' into 5.8 2016-11-01 06:02:55 +01:00
qpainterpath tst_QPainterPath: clean up 2016-08-05 19:33:05 +00:00
qpainterpathstroker Updated license headers 2016-01-21 18:55:18 +00:00
qpathclipper Use qtConfig throughout in qtbase 2016-08-19 04:28:05 +00:00
qpdfwriter Updated license headers 2016-01-21 18:55:18 +00:00
qpen Updated license headers 2016-01-21 18:55:18 +00:00
qpolygon QPolygon: add a smoke-test for boundingRect() 2016-08-04 10:46:06 +00:00
qregion Change confusing Q_DEAD_CODE_FROM_QT4_FOO define 2016-10-14 08:19:29 +00:00
qtransform Remove inclusion of -lm for INTEGRITY. 2016-03-18 20:40:59 +00:00
qwmatrix QtGui: Remove Windows CE. 2016-03-30 17:35:41 +00:00
painting.pro Use qtConfig throughout in qtbase 2016-08-19 04:28:05 +00:00