qt5base-lts/examples/xml/streambookmarks
Liang Qi e918605f42 Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
	src/corelib/json/qjsonparser.cpp
	src/gui/opengl/qopengl.cpp

Change-Id: Ib4d3208398399691839e6c6eaeb9006f99e3a62b
2016-11-04 11:39:15 +01:00
..
doc Unify license header usage. 2016-03-29 10:20:03 +00:00
jennifer.xbel Update bookmarks in the XML bookmarks examples 2016-11-01 08:37:50 +00:00
main.cpp Unify license header usage. 2016-03-29 10:20:03 +00:00
mainwindow.cpp Unify license header usage. 2016-03-29 10:20:03 +00:00
mainwindow.h Unify license header usage. 2016-03-29 10:20:03 +00:00
streambookmarks.pro centralize and fixup example sources install targets 2012-11-29 20:21:11 +01:00
xbelreader.cpp Unify license header usage. 2016-03-29 10:20:03 +00:00
xbelreader.h Unify license header usage. 2016-03-29 10:20:03 +00:00
xbelwriter.cpp Unify license header usage. 2016-03-29 10:20:03 +00:00
xbelwriter.h Unify license header usage. 2016-03-29 10:20:03 +00:00