Simon Hausmann e2f66f9215 Merge remote-tracking branch 'origin/5.5' into dev ... Conflicts: src/corelib/global/qnamespace.qdoc src/corelib/io/qwindowspipereader.cpp src/corelib/io/qwindowspipereader_p.h src/corelib/statemachine/qstatemachine.cpp src/corelib/statemachine/qstatemachine_p.h src/plugins/platforms/xcb/qxcbconnection.h tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp tests/auto/tools/qmake/tst_qmake.cpp tests/manual/touch/main.cpp Change-Id: I917d694890e79ee3da7d65134b5b085e23e0dd62		2015-06-03 10:23:56 +02:00
..
addressbook-tutorial.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
addressbook.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
affine.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
analogclock.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
animatedtiles.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
appchooser.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
application.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
basicdrawing.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
basicgraphicslayouts.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
basiclayouts.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
basicsortfiltermodel.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
blurpicker.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
borderlayout.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
boxes.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
calculator.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
calendar.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
calendarwidget.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
charactermap.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
chart.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
chip.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
classwizard.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
codeeditor.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
collidingmice-example.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
coloreditorfactory.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
combowidgetmapper.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
completer.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
composition.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
concentriccircles.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
configdialog.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
customsortfiltermodel.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
deform.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
diagramscene.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
digitalclock.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
dirview.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
dockwidgets.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
draganddroppuzzle.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
dragdroprobot.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
draggableicons.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
draggabletext.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
dynamiclayouts.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
easing.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
echoplugin.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
editabletreemodel.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
elasticnodes.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
elidedlabel.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
embeddeddialogs.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
eventtransitions.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
extension.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
factorial.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
fademessage.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
fetchmore.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
findfiles.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
flowlayout.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
fontsampler.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
fridgemagnets.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
frozencolumn.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
gradients.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
graphicsview-anchorlayout.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
graphicsview-flowlayout.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
graphicsview-simpleanchorlayout.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
graphicsview-weatheranchorlayout.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
groupbox.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
i18n.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
icons.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
imagecomposition.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
imageviewer.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
interview.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
itemviewspuzzle.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
licensewizard.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
lighting.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
lineedits.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
mainwindow.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
mdi.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
menus.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
moveblocks.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
movie.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
orderform.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
padnavigator.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
painterpaths.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
pathstroke.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
pingpong.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
pixelator.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
plugandpaint.qdoc	Merge remote-tracking branch 'origin/5.4' into 5.5	2015-06-01 17:46:58 +02:00
recentfiles.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
regexp.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
regularexpression.qdoc	Add QRegularExpression based regexp tool	2015-04-02 13:19:30 +00:00
rogue.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
screenshot.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
scribble.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
sdi.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
settingseditor.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
shapedclock.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
simpledommodel.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
simpletreemodel.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
simplewidgetmapper.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
sipdialog.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
sliders.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
spinboxdelegate.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
spinboxes.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
spreadsheet.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
standarddialogs.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
stardelegate.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
states.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
stickman.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
styleplugin.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
styles.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
stylesheet.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
sub-attaq.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
syntaxhighlighter.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
tabdialog.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
tablet.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
tetrix.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
textedit.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
tooltips.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
trafficlight.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
transformations.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
treemodelcompleter.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
trivialwizard.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
twowaybutton.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
undo.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
undoframework.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
validators.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
wiggly.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
windowflags.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00