AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
a732576a66
qt5base-lts/tests/auto/widgets/graphicsview
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
..
qgraphicsanchorlayout Updated license headers 2016-01-21 18:55:18 +00:00
qgraphicsanchorlayout1 Updated license headers 2016-01-21 18:55:18 +00:00
qgraphicseffectsource Updated license headers 2016-01-21 18:55:18 +00:00
qgraphicsgridlayout QtWidgets: Remove Windows CE. 2016-04-07 10:24:45 +00:00
qgraphicsitem Merge remote-tracking branch 'origin/5.7' into 5.8 2016-11-01 06:02:55 +01:00
qgraphicsitemanimation Updated license headers 2016-01-21 18:55:18 +00:00
qgraphicslayout Updated license headers 2016-01-21 18:55:18 +00:00
qgraphicslayoutitem Updated license headers 2016-01-21 18:55:18 +00:00
qgraphicslinearlayout Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-07 10:47:20 +02:00
qgraphicsobject Updated license headers 2016-01-21 18:55:18 +00:00
qgraphicspixmapitem Updated license headers 2016-01-21 18:55:18 +00:00
qgraphicspolygonitem Updated license headers 2016-01-21 18:55:18 +00:00
qgraphicsproxywidget Change confusing Q_DEAD_CODE_FROM_QT4_FOO define 2016-10-14 08:19:29 +00:00
qgraphicsscene Fix Infinite loop in QGraphicsScene::focusNextPrevChild 2016-06-07 08:44:34 +00:00
qgraphicssceneindex Use qtConfig throughout in qtbase 2016-08-19 04:28:05 +00:00
qgraphicstransform Updated license headers 2016-01-21 18:55:18 +00:00
qgraphicsview Merge remote-tracking branch 'origin/5.7' into 5.8 2016-11-01 06:02:55 +01:00
qgraphicswidget Merge remote-tracking branch 'origin/5.7' into dev 2016-05-03 15:49:15 +02:00
graphicsview.pro Use qtConfig throughout in qtbase 2016-08-19 04:28:05 +00:00