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-adddialog.png	Move address book example images to proper location.	2012-08-28 23:34:25 +02:00
addressbook-classes.png	Move address book example images to proper location.	2012-08-28 23:34:25 +02:00
addressbook-editdialog.png	Move address book example images to proper location.	2012-08-28 23:34:25 +02:00
addressbook-example.png	Move address book example images to proper location.	2012-08-28 23:34:25 +02:00
addressbook-filemenu.png	Moved a bunch of widgets example images from qtdoc to qtwidgets	2012-08-20 21:11:42 +02:00
addressbook-newaddresstab.png	Move address book example images to proper location.	2012-08-28 23:34:25 +02:00
addressbook-signals.png	Move address book example images to proper location.	2012-08-28 23:34:25 +02:00
addressbook-toolsmenu.png	Moved a bunch of widgets example images from qtdoc to qtwidgets	2012-08-20 21:11:42 +02:00
analogclock-viewport.png	Moved a bunch of widgets example images from qtdoc to qtwidgets	2012-08-20 21:11:42 +02:00
basicgraphicslayouts-example.png	Update some screenshots in qtbase/examples/widgets.	2014-01-31 14:46:31 +01:00
basiclayouts-example.png	Update some screenshots in qtbase/examples/widgets.	2014-01-31 14:46:31 +01:00
calendar-example.png	doc: Add missing images in richtext example docs	2012-12-06 14:46:13 +01:00
collidingmice-example.png	Doc: Added documentation for the collidingmice example	2012-12-05 15:30:07 +01:00
completer-example-country.png	Examples: move widgets specific "tools" examples to the correct place	2012-11-28 00:56:34 +01:00
completer-example-dirmodel.png	Doc: Widgets/Tools examples: fix group and missing images	2013-01-27 10:21:53 +01:00
completer-example-qdirmodel.png	Doc: Widgets/Tools examples: fix group and missing images	2013-01-27 10:21:53 +01:00
completer-example-word.png	Examples: move widgets specific "tools" examples to the correct place	2012-11-28 00:56:34 +01:00
completer-example.png	Examples: move widgets specific "tools" examples to the correct place	2012-11-28 00:56:34 +01:00
draganddroppuzzle-example.png	Update some more screenshots in qtbase/examples/widgets.	2014-01-31 16:18:07 +01:00
dropsite-example.png	New Qt logo	2014-11-05 08:10:42 +01:00
echopluginexample.png	Update some more screenshots in qtbase/examples/widgets.	2014-01-31 16:18:07 +01:00
factorial-example.png	Moved a bunch of widgets example images from qtdoc to qtwidgets	2012-08-20 21:11:42 +02:00
fademessageeffect-example-faded.png	Moved a bunch of widgets example images from qtdoc to qtwidgets	2012-08-20 21:11:42 +02:00
fademessageeffect-example.png	Moved a bunch of widgets example images from qtdoc to qtwidgets	2012-08-20 21:11:42 +02:00
fridgemagnets-example.png	Update some screenshots in qtbase/examples/widgets.	2014-01-31 14:46:31 +01:00
geometry.png	Moved a bunch of widgets example images from qtdoc to qtwidgets	2012-08-20 21:11:42 +02:00
graphicsanchorlayout-example.png	Update some screenshots in qtbase/examples/widgets.	2014-01-31 14:46:31 +01:00
graphicsflowlayout-example.png	Update some more screenshots in qtbase/examples/widgets.	2014-01-31 16:18:07 +01:00
graphicssimpleanchorlayout-example.png	Update some screenshots in qtbase/examples/widgets.	2014-01-31 14:46:31 +01:00
icons_monkey_mess.png	Moved a bunch of widgets example images from qtdoc to qtwidgets	2012-08-20 21:11:42 +02:00
icons_monkey.png	Moved a bunch of widgets example images from qtdoc to qtwidgets	2012-08-20 21:11:42 +02:00
icons_qt_extended_8x8.png	New Qt logo	2014-11-05 08:10:42 +01:00
icons_qt_extended_16x16.png	New Qt logo	2014-11-05 08:10:42 +01:00
icons_qt_extended_17x17.png	New Qt logo	2014-11-05 08:10:42 +01:00
icons_qt_extended_32x32.png	New Qt logo	2014-11-05 08:10:42 +01:00
icons_qt_extended_33x33.png	New Qt logo	2014-11-05 08:10:42 +01:00
icons_qt_extended_48x48.png	New Qt logo	2014-11-05 08:10:42 +01:00
icons_qt_extended_64x64.png	New Qt logo	2014-11-05 08:10:42 +01:00
imagegestures-example.jpg	Doc: Added the missing \brief and \image for example docs	2015-05-27 10:27:54 +00:00
imageviewer-fit_to_window_1.png	Moved a bunch of widgets example images from qtdoc to qtwidgets	2012-08-20 21:11:42 +02:00
imageviewer-fit_to_window_2.png	Moved a bunch of widgets example images from qtdoc to qtwidgets	2012-08-20 21:11:42 +02:00
imageviewer-original_size.png	Moved a bunch of widgets example images from qtdoc to qtwidgets	2012-08-20 21:11:42 +02:00
imageviewer-zoom_in_1.png	Moved a bunch of widgets example images from qtdoc to qtwidgets	2012-08-20 21:11:42 +02:00
imageviewer-zoom_in_2.png	Moved a bunch of widgets example images from qtdoc to qtwidgets	2012-08-20 21:11:42 +02:00
itemviews-editabletreemodel-indexes.png	Moved a bunch of widgets example images from qtdoc to qtwidgets	2012-08-20 21:11:42 +02:00
itemviews-editabletreemodel-items.png	Moved a bunch of widgets example images from qtdoc to qtwidgets	2012-08-20 21:11:42 +02:00
itemviews-editabletreemodel-model.png	Moved a bunch of widgets example images from qtdoc to qtwidgets	2012-08-20 21:11:42 +02:00
itemviews-editabletreemodel-values.png	Moved a bunch of widgets example images from qtdoc to qtwidgets	2012-08-20 21:11:42 +02:00
itemviews-editabletreemodel.png	Fix linking of itemviews and graphicsview examples	2012-12-04 08:14:33 +01:00
itemviewspuzzle-example.png	Update some more screenshots in qtbase/examples/widgets.	2014-01-31 16:18:07 +01:00
layout1.png	Moved a bunch of widgets example images from qtdoc to qtwidgets	2012-08-20 21:11:42 +02:00
layout2.png	Moved a bunch of widgets example images from qtdoc to qtwidgets	2012-08-20 21:11:42 +02:00
mainwindow-demo.png	Update some screenshots in qtbase/examples/widgets.	2014-01-31 14:46:31 +01:00
mousebutton-buttontester.png	Update some screenshots in qtbase/examples/widgets.	2014-01-31 14:46:31 +01:00
orderform-example.png	doc: Add missing images in richtext example docs	2012-12-06 14:46:13 +01:00
pingpong-example.png	Moved a bunch of widgets example images from qtdoc to qtwidgets	2012-08-20 21:11:42 +02:00
plugandpaint-plugindialog.png	Examples: move widgets specific "tools" examples to the correct place	2012-11-28 00:56:34 +01:00
plugandpaint.png	Examples: move widgets specific "tools" examples to the correct place	2012-11-28 00:56:34 +01:00
regexp-example.png	Examples: move widgets specific "tools" examples to the correct place	2012-11-28 00:56:34 +01:00
regularexpression-example.png	Add QRegularExpression based regexp tool	2015-04-02 13:19:30 +00:00
settingseditor-example.png	Examples: move widgets specific "tools" examples to the correct place	2012-11-28 00:56:34 +01:00
sipdialog-closed.png	Moved a bunch of widgets example images from qtdoc to qtwidgets	2012-08-20 21:11:42 +02:00
sipdialog-opened.png	Moved a bunch of widgets example images from qtdoc to qtwidgets	2012-08-20 21:11:42 +02:00
stylepluginexample.png	Examples: move widgets specific "tools" examples to the correct place	2012-11-28 00:56:34 +01:00
stylesheet-pagefold.png	Fix broken links in the QtWidgets examples.	2012-11-30 19:40:47 +01:00
textedit-demo.png	doc: Add missing images in richtext example docs	2012-12-06 14:46:13 +01:00
trafficlight-example1.png	Moved a bunch of widgets example images from qtdoc to qtwidgets	2012-08-20 21:11:42 +02:00
trafficlight-example2.png	Moved a bunch of widgets example images from qtdoc to qtwidgets	2012-08-20 21:11:42 +02:00
treemodel-structure.png	Moved a bunch of widgets example images from qtdoc to qtwidgets	2012-08-20 21:11:42 +02:00
treemodelcompleter-example.png	Examples: move widgets specific "tools" examples to the correct place	2012-11-28 00:56:34 +01:00
undodemo.png	Examples: move widgets specific "tools" examples to the correct place	2012-11-28 00:56:34 +01:00
undoframeworkexample.png	Examples: move widgets specific "tools" examples to the correct place	2012-11-28 00:56:34 +01:00
weatheranchorlayout-example.png	Doc: Added documentation for the examples	2012-12-11 10:37:51 +01:00