AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
a8ad67e939
qt5base-lts/examples/widgets
History
Liang Qi 56d6e000f7 Merge remote-tracking branch 'origin/5.7' into dev 
Conflicts:
	mkspecs/wince80colibri-armv7-msvc2012/qmake.conf
	qmake/generators/win32/msvc_vcproj.cpp
	src/corelib/global/qnamespace.h
	src/corelib/global/qnamespace.qdoc
	src/corelib/io/qfsfileengine_win.cpp
	src/corelib/tools/tools.pri
	src/network/ssl/qsslconfiguration_p.h
	src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp
	src/plugins/platforms/windows/windows.pri
	src/src.pro
	src/tools/bootstrap/bootstrap.pro
	src/tools/uic/cpp/cppwriteinitialization.cpp
	src/widgets/dialogs/qfilesystemmodel.cpp
	tests/auto/testlib/selftests/expected_cmptest.teamcity
	tests/auto/testlib/selftests/expected_cmptest.txt

Change-Id: I4d2ac78f0dcc97f008186bbbc769c6fe588ab0e5
2016-05-23 21:09:46 +02:00
..
animation Unify license header usage. 2016-03-29 10:20:03 +00:00
desktop Unify license header usage. 2016-03-29 10:20:03 +00:00
dialogs Unify license header usage. 2016-03-29 10:20:03 +00:00
doc Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-06 15:36:44 +02:00
draganddrop QtWidgets: Remove Windows CE. 2016-04-07 10:24:45 +00:00
effects Unify license header usage. 2016-03-29 10:20:03 +00:00
gestures Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-07 10:47:20 +02:00
graphicsview Merge remote-tracking branch 'origin/5.7' into dev 2016-05-12 08:33:08 +02:00
itemviews Merge remote-tracking branch 'origin/5.7' into dev 2016-05-23 21:09:46 +02:00
layouts Unify license header usage. 2016-03-29 10:20:03 +00:00
mac Updated license headers 2016-01-21 18:55:32 +00:00
mainwindows Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-13 06:55:37 +02:00
painting QtWidgets: Remove Windows CE. 2016-04-07 10:24:45 +00:00
richtext QtWidgets: Remove Windows CE. 2016-04-07 10:24:45 +00:00
scroller Unify license header usage. 2016-03-29 10:20:03 +00:00
statemachine Unify license header usage. 2016-03-29 10:20:03 +00:00
tools Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-06 15:36:44 +02:00
tutorials Unify license header usage. 2016-03-29 10:20:03 +00:00
widgets Merge remote-tracking branch 'origin/5.7' into dev 2016-04-11 09:12:36 +02:00
windowcontainer Unify license header usage. 2016-03-29 10:20:03 +00:00
widgets.pro purge vestiges of opengl es 1 support 2014-04-04 19:32:21 +02:00