summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
Diffstat (limited to 'examples')
-rw-r--r--examples/corelib/corelib.pro1
-rw-r--r--examples/corelib/ipc/doc/src/localfortuneclient.qdoc10
-rw-r--r--examples/corelib/ipc/doc/src/localfortuneserver.qdoc10
-rw-r--r--examples/corelib/ipc/doc/src/sharedmemory.qdoc10
-rw-r--r--examples/corelib/ipc/ipc.pro2
-rw-r--r--examples/corelib/ipc/localfortuneclient/client.cpp16
-rw-r--r--examples/corelib/ipc/localfortuneclient/client.h16
-rw-r--r--examples/corelib/ipc/localfortuneclient/main.cpp16
-rw-r--r--examples/corelib/ipc/localfortuneserver/main.cpp16
-rw-r--r--examples/corelib/ipc/localfortuneserver/server.cpp16
-rw-r--r--examples/corelib/ipc/localfortuneserver/server.h16
-rw-r--r--examples/corelib/ipc/sharedmemory/dialog.cpp16
-rw-r--r--examples/corelib/ipc/sharedmemory/dialog.h16
-rw-r--r--examples/corelib/ipc/sharedmemory/main.cpp16
-rw-r--r--examples/corelib/json/savegame/character.cpp16
-rw-r--r--examples/corelib/json/savegame/character.h16
-rw-r--r--examples/corelib/json/savegame/doc/src/savegame.qdoc10
-rw-r--r--examples/corelib/json/savegame/game.cpp16
-rw-r--r--examples/corelib/json/savegame/game.h16
-rw-r--r--examples/corelib/json/savegame/level.cpp16
-rw-r--r--examples/corelib/json/savegame/level.h16
-rw-r--r--examples/corelib/json/savegame/main.cpp16
-rw-r--r--examples/corelib/mimetypes/doc/images/mimetypebrowser.pngbin0 -> 7051 bytes
-rw-r--r--examples/corelib/mimetypes/doc/src/mimetypebrowser.qdoc54
-rw-r--r--examples/corelib/mimetypes/mimetypebrowser/main.cpp69
-rw-r--r--examples/corelib/mimetypes/mimetypebrowser/mainwindow.cpp185
-rw-r--r--examples/corelib/mimetypes/mimetypebrowser/mainwindow.h79
-rw-r--r--examples/corelib/mimetypes/mimetypebrowser/mimetypebrowser.pro16
-rw-r--r--examples/corelib/mimetypes/mimetypebrowser/mimetypemodel.cpp202
-rw-r--r--examples/corelib/mimetypes/mimetypebrowser/mimetypemodel.h74
-rw-r--r--examples/corelib/mimetypes/mimetypes.pro4
-rw-r--r--examples/corelib/threads/doc/src/mandelbrot.qdoc10
-rw-r--r--examples/corelib/threads/doc/src/queuedcustomtype.qdoc10
-rw-r--r--examples/corelib/threads/doc/src/semaphores.qdoc10
-rw-r--r--examples/corelib/threads/doc/src/waitconditions.qdoc10
-rw-r--r--examples/corelib/threads/mandelbrot/main.cpp16
-rw-r--r--examples/corelib/threads/mandelbrot/mandelbrotwidget.cpp16
-rw-r--r--examples/corelib/threads/mandelbrot/mandelbrotwidget.h16
-rw-r--r--examples/corelib/threads/mandelbrot/renderthread.cpp16
-rw-r--r--examples/corelib/threads/mandelbrot/renderthread.h16
-rw-r--r--examples/corelib/threads/queuedcustomtype/block.cpp16
-rw-r--r--examples/corelib/threads/queuedcustomtype/block.h16
-rw-r--r--examples/corelib/threads/queuedcustomtype/main.cpp16
-rw-r--r--examples/corelib/threads/queuedcustomtype/renderthread.cpp16
-rw-r--r--examples/corelib/threads/queuedcustomtype/renderthread.h16
-rw-r--r--examples/corelib/threads/queuedcustomtype/window.cpp16
-rw-r--r--examples/corelib/threads/queuedcustomtype/window.h16
-rw-r--r--examples/corelib/threads/semaphores/semaphores.cpp16
-rw-r--r--examples/corelib/threads/waitconditions/waitconditions.cpp16
-rw-r--r--examples/corelib/tools/contiguouscache/main.cpp16
-rw-r--r--examples/corelib/tools/contiguouscache/randomlistmodel.cpp16
-rw-r--r--examples/corelib/tools/contiguouscache/randomlistmodel.h16
-rw-r--r--examples/corelib/tools/customtype/main.cpp16
-rw-r--r--examples/corelib/tools/customtype/message.cpp16
-rw-r--r--examples/corelib/tools/customtype/message.h16
-rw-r--r--examples/corelib/tools/customtypesending/main.cpp16
-rw-r--r--examples/corelib/tools/customtypesending/message.cpp16
-rw-r--r--examples/corelib/tools/customtypesending/message.h16
-rw-r--r--examples/corelib/tools/customtypesending/window.cpp16
-rw-r--r--examples/corelib/tools/customtypesending/window.h16
-rw-r--r--examples/corelib/tools/doc/src/contiguouscache.qdoc10
-rw-r--r--examples/corelib/tools/doc/src/customtype.qdoc10
-rw-r--r--examples/dbus/chat/chat.cpp16
-rw-r--r--examples/dbus/chat/chat.h16
-rw-r--r--examples/dbus/complexpingpong/complexping.cpp16
-rw-r--r--examples/dbus/complexpingpong/complexping.h16
-rw-r--r--examples/dbus/complexpingpong/complexpong.cpp16
-rw-r--r--examples/dbus/complexpingpong/complexpong.h16
-rw-r--r--examples/dbus/complexpingpong/ping-common.h16
-rw-r--r--examples/dbus/doc/src/chat.qdoc10
-rw-r--r--examples/dbus/doc/src/complexpingpong.qdoc10
-rw-r--r--examples/dbus/doc/src/listnames.qdoc10
-rw-r--r--examples/dbus/doc/src/pingpong.qdoc10
-rw-r--r--examples/dbus/listnames/listnames.cpp16
-rw-r--r--examples/dbus/pingpong/ping-common.h16
-rw-r--r--examples/dbus/pingpong/ping.cpp16
-rw-r--r--examples/dbus/pingpong/pong.cpp16
-rw-r--r--examples/dbus/pingpong/pong.h16
-rw-r--r--examples/dbus/remotecontrolledcar/car/car.cpp16
-rw-r--r--examples/dbus/remotecontrolledcar/car/car.h16
-rw-r--r--examples/dbus/remotecontrolledcar/car/main.cpp16
-rw-r--r--examples/dbus/remotecontrolledcar/controller/controller.cpp16
-rw-r--r--examples/dbus/remotecontrolledcar/controller/controller.h16
-rw-r--r--examples/dbus/remotecontrolledcar/controller/main.cpp16
-rw-r--r--examples/dbus/remotecontrolledcar/doc/src/dbus-remotecontrolledcar.qdoc10
-rw-r--r--examples/embedded/digiflip/digiflip.cpp49
-rw-r--r--examples/embedded/flickable/flickable.cpp49
-rw-r--r--examples/embedded/flickable/flickable.h49
-rw-r--r--examples/embedded/flickable/main.cpp49
-rw-r--r--examples/embedded/flightinfo/flightinfo.cpp49
-rw-r--r--examples/embedded/lightmaps/lightmaps.cpp49
-rw-r--r--examples/embedded/lightmaps/lightmaps.h49
-rw-r--r--examples/embedded/lightmaps/main.cpp53
-rw-r--r--examples/embedded/lightmaps/mapzoom.cpp49
-rw-r--r--examples/embedded/lightmaps/mapzoom.h53
-rw-r--r--examples/embedded/lightmaps/slippymap.cpp49
-rw-r--r--examples/embedded/lightmaps/slippymap.h49
-rw-r--r--examples/embedded/raycasting/raycasting.cpp49
-rw-r--r--examples/embedded/styleexample/main.cpp53
-rw-r--r--examples/embedded/styleexample/stylewidget.cpp49
-rw-r--r--examples/embedded/styleexample/stylewidget.h53
-rw-r--r--examples/gui/analogclock/main.cpp16
-rw-r--r--examples/gui/doc/src/analogclockwindow.qdoc10
-rw-r--r--examples/gui/doc/src/openglwindow.qdoc10
-rw-r--r--examples/gui/doc/src/rasterwindow.qdoc10
-rw-r--r--examples/gui/openglwindow/main.cpp16
-rw-r--r--examples/gui/openglwindow/openglwindow.cpp16
-rw-r--r--examples/gui/openglwindow/openglwindow.h16
-rw-r--r--examples/gui/rasterwindow/main.cpp16
-rw-r--r--examples/gui/rasterwindow/rasterwindow.cpp16
-rw-r--r--examples/gui/rasterwindow/rasterwindow.h16
-rw-r--r--examples/network/bearermonitor/bearermonitor.cpp16
-rw-r--r--examples/network/bearermonitor/bearermonitor.h16
-rw-r--r--examples/network/bearermonitor/main.cpp16
-rw-r--r--examples/network/bearermonitor/sessionwidget.cpp16
-rw-r--r--examples/network/bearermonitor/sessionwidget.h16
-rw-r--r--examples/network/blockingfortuneclient/blockingclient.cpp16
-rw-r--r--examples/network/blockingfortuneclient/blockingclient.h16
-rw-r--r--examples/network/blockingfortuneclient/fortunethread.cpp44
-rw-r--r--examples/network/blockingfortuneclient/fortunethread.h16
-rw-r--r--examples/network/blockingfortuneclient/main.cpp16
-rw-r--r--examples/network/broadcastreceiver/main.cpp16
-rw-r--r--examples/network/broadcastreceiver/receiver.cpp16
-rw-r--r--examples/network/broadcastreceiver/receiver.h16
-rw-r--r--examples/network/broadcastsender/main.cpp16
-rw-r--r--examples/network/broadcastsender/sender.cpp16
-rw-r--r--examples/network/broadcastsender/sender.h16
-rw-r--r--examples/network/dnslookup/dnslookup.cpp16
-rw-r--r--examples/network/dnslookup/dnslookup.h16
-rw-r--r--examples/network/doc/src/blockingfortuneclient.qdoc43
-rw-r--r--examples/network/doc/src/broadcastreceiver.qdoc10
-rw-r--r--examples/network/doc/src/broadcastsender.qdoc10
-rw-r--r--examples/network/doc/src/fortuneclient.qdoc55
-rw-r--r--examples/network/doc/src/fortuneserver.qdoc23
-rw-r--r--examples/network/doc/src/googlesuggest.qdoc10
-rw-r--r--examples/network/doc/src/http.qdoc10
-rw-r--r--examples/network/doc/src/loopback.qdoc10
-rw-r--r--examples/network/doc/src/multicastreceiver.qdoc10
-rw-r--r--examples/network/doc/src/multicastsender.qdoc10
-rw-r--r--examples/network/doc/src/network-chat.qdoc10
-rw-r--r--examples/network/doc/src/network-download.qdoc10
-rw-r--r--examples/network/doc/src/network-downloadmanager.qdoc10
-rw-r--r--examples/network/doc/src/securesocketclient.qdoc10
-rw-r--r--examples/network/doc/src/threadedfortuneserver.qdoc10
-rw-r--r--examples/network/doc/src/torrent.qdoc10
-rw-r--r--examples/network/download/main.cpp16
-rw-r--r--examples/network/downloadmanager/downloadmanager.cpp16
-rw-r--r--examples/network/downloadmanager/downloadmanager.h16
-rw-r--r--examples/network/downloadmanager/main.cpp16
-rw-r--r--examples/network/downloadmanager/textprogressbar.cpp16
-rw-r--r--examples/network/downloadmanager/textprogressbar.h16
-rw-r--r--examples/network/fortuneclient/client.cpp50
-rw-r--r--examples/network/fortuneclient/client.h19
-rw-r--r--examples/network/fortuneclient/main.cpp16
-rw-r--r--examples/network/fortuneserver/main.cpp16
-rw-r--r--examples/network/fortuneserver/server.cpp23
-rw-r--r--examples/network/fortuneserver/server.h16
-rw-r--r--examples/network/googlesuggest/googlesuggest.cpp16
-rw-r--r--examples/network/googlesuggest/googlesuggest.h16
-rw-r--r--examples/network/googlesuggest/main.cpp16
-rw-r--r--examples/network/googlesuggest/searchbox.cpp16
-rw-r--r--examples/network/googlesuggest/searchbox.h16
-rw-r--r--examples/network/http/httpwindow.cpp16
-rw-r--r--examples/network/http/httpwindow.h16
-rw-r--r--examples/network/http/main.cpp16
-rw-r--r--examples/network/loopback/dialog.cpp16
-rw-r--r--examples/network/loopback/dialog.h16
-rw-r--r--examples/network/loopback/main.cpp16
-rw-r--r--examples/network/multicastreceiver/main.cpp16
-rw-r--r--examples/network/multicastreceiver/receiver.cpp16
-rw-r--r--examples/network/multicastreceiver/receiver.h16
-rw-r--r--examples/network/multicastsender/main.cpp16
-rw-r--r--examples/network/multicastsender/sender.cpp16
-rw-r--r--examples/network/multicastsender/sender.h16
-rw-r--r--examples/network/network-chat/chatdialog.cpp16
-rw-r--r--examples/network/network-chat/chatdialog.h16
-rw-r--r--examples/network/network-chat/client.cpp16
-rw-r--r--examples/network/network-chat/client.h16
-rw-r--r--examples/network/network-chat/connection.cpp16
-rw-r--r--examples/network/network-chat/connection.h16
-rw-r--r--examples/network/network-chat/main.cpp16
-rw-r--r--examples/network/network-chat/peermanager.cpp16
-rw-r--r--examples/network/network-chat/peermanager.h16
-rw-r--r--examples/network/network-chat/server.cpp16
-rw-r--r--examples/network/network-chat/server.h16
-rw-r--r--examples/network/network.pro19
-rw-r--r--examples/network/securesocketclient/certificateinfo.cpp16
-rw-r--r--examples/network/securesocketclient/certificateinfo.h16
-rw-r--r--examples/network/securesocketclient/main.cpp16
-rw-r--r--examples/network/securesocketclient/sslclient.cpp16
-rw-r--r--examples/network/securesocketclient/sslclient.h16
-rw-r--r--examples/network/threadedfortuneserver/dialog.cpp16
-rw-r--r--examples/network/threadedfortuneserver/dialog.h16
-rw-r--r--examples/network/threadedfortuneserver/fortuneserver.cpp16
-rw-r--r--examples/network/threadedfortuneserver/fortuneserver.h16
-rw-r--r--examples/network/threadedfortuneserver/fortunethread.cpp19
-rw-r--r--examples/network/threadedfortuneserver/fortunethread.h16
-rw-r--r--examples/network/threadedfortuneserver/main.cpp16
-rw-r--r--examples/network/torrent/addtorrentdialog.cpp16
-rw-r--r--examples/network/torrent/addtorrentdialog.h16
-rw-r--r--examples/network/torrent/bencodeparser.cpp16
-rw-r--r--examples/network/torrent/bencodeparser.h16
-rw-r--r--examples/network/torrent/connectionmanager.cpp16
-rw-r--r--examples/network/torrent/connectionmanager.h16
-rw-r--r--examples/network/torrent/filemanager.cpp16
-rw-r--r--examples/network/torrent/filemanager.h16
-rw-r--r--examples/network/torrent/main.cpp16
-rw-r--r--examples/network/torrent/mainwindow.cpp16
-rw-r--r--examples/network/torrent/mainwindow.h16
-rw-r--r--examples/network/torrent/metainfo.cpp16
-rw-r--r--examples/network/torrent/metainfo.h16
-rw-r--r--examples/network/torrent/peerwireclient.cpp16
-rw-r--r--examples/network/torrent/peerwireclient.h16
-rw-r--r--examples/network/torrent/ratecontroller.cpp16
-rw-r--r--examples/network/torrent/ratecontroller.h16
-rw-r--r--examples/network/torrent/torrentclient.cpp16
-rw-r--r--examples/network/torrent/torrentclient.h16
-rw-r--r--examples/network/torrent/torrentserver.cpp16
-rw-r--r--examples/network/torrent/torrentserver.h16
-rw-r--r--examples/network/torrent/trackerclient.cpp16
-rw-r--r--examples/network/torrent/trackerclient.h16
-rw-r--r--examples/opengl/2dpainting/glwidget.cpp16
-rw-r--r--examples/opengl/2dpainting/glwidget.h16
-rw-r--r--examples/opengl/2dpainting/helper.cpp16
-rw-r--r--examples/opengl/2dpainting/helper.h16
-rw-r--r--examples/opengl/2dpainting/main.cpp16
-rw-r--r--examples/opengl/2dpainting/widget.cpp16
-rw-r--r--examples/opengl/2dpainting/widget.h16
-rw-r--r--examples/opengl/2dpainting/window.cpp16
-rw-r--r--examples/opengl/2dpainting/window.h16
-rw-r--r--examples/opengl/contextinfo/main.cpp16
-rw-r--r--examples/opengl/contextinfo/renderwindow.cpp16
-rw-r--r--examples/opengl/contextinfo/renderwindow.h16
-rw-r--r--examples/opengl/contextinfo/widget.cpp16
-rw-r--r--examples/opengl/contextinfo/widget.h16
-rw-r--r--examples/opengl/cube/geometryengine.cpp16
-rw-r--r--examples/opengl/cube/geometryengine.h16
-rw-r--r--examples/opengl/cube/main.cpp16
-rw-r--r--examples/opengl/cube/mainwidget.cpp16
-rw-r--r--examples/opengl/cube/mainwidget.h16
-rw-r--r--examples/opengl/doc/src/2dpainting.qdoc10
-rw-r--r--examples/opengl/doc/src/cube.qdoc10
-rw-r--r--examples/opengl/doc/src/hellogl2.qdoc10
-rw-r--r--examples/opengl/doc/src/textures.qdoc10
-rw-r--r--examples/opengl/hellogl2/glwidget.cpp16
-rw-r--r--examples/opengl/hellogl2/glwidget.h16
-rw-r--r--examples/opengl/hellogl2/logo.cpp16
-rw-r--r--examples/opengl/hellogl2/logo.h16
-rw-r--r--examples/opengl/hellogl2/main.cpp16
-rw-r--r--examples/opengl/hellogl2/mainwindow.cpp16
-rw-r--r--examples/opengl/hellogl2/mainwindow.h16
-rw-r--r--examples/opengl/hellogl2/window.cpp16
-rw-r--r--examples/opengl/hellogl2/window.h16
-rw-r--r--examples/opengl/hellogles3/glwindow.cpp16
-rw-r--r--examples/opengl/hellogles3/glwindow.h16
-rw-r--r--examples/opengl/hellogles3/main.cpp16
-rw-r--r--examples/opengl/hellowindow/hellowindow.cpp16
-rw-r--r--examples/opengl/hellowindow/hellowindow.h16
-rw-r--r--examples/opengl/hellowindow/main.cpp16
-rw-r--r--examples/opengl/legacy/framebufferobject2/glwidget.cpp16
-rw-r--r--examples/opengl/legacy/framebufferobject2/glwidget.h16
-rw-r--r--examples/opengl/legacy/framebufferobject2/main.cpp16
-rw-r--r--examples/opengl/legacy/grabber/glwidget.cpp16
-rw-r--r--examples/opengl/legacy/grabber/glwidget.h16
-rw-r--r--examples/opengl/legacy/grabber/main.cpp16
-rw-r--r--examples/opengl/legacy/grabber/mainwindow.cpp16
-rw-r--r--examples/opengl/legacy/grabber/mainwindow.h16
-rw-r--r--examples/opengl/legacy/hellogl/glwidget.cpp16
-rw-r--r--examples/opengl/legacy/hellogl/glwidget.h16
-rw-r--r--examples/opengl/legacy/hellogl/main.cpp16
-rw-r--r--examples/opengl/legacy/hellogl/window.cpp16
-rw-r--r--examples/opengl/legacy/hellogl/window.h16
-rw-r--r--examples/opengl/legacy/overpainting/bubble.cpp16
-rw-r--r--examples/opengl/legacy/overpainting/bubble.h16
-rw-r--r--examples/opengl/legacy/overpainting/glwidget.cpp16
-rw-r--r--examples/opengl/legacy/overpainting/glwidget.h16
-rw-r--r--examples/opengl/legacy/overpainting/main.cpp16
-rw-r--r--examples/opengl/legacy/pbuffers/cube.cpp16
-rw-r--r--examples/opengl/legacy/pbuffers/cube.h16
-rw-r--r--examples/opengl/legacy/pbuffers/glwidget.cpp16
-rw-r--r--examples/opengl/legacy/pbuffers/glwidget.h16
-rw-r--r--examples/opengl/legacy/pbuffers/main.cpp16
-rw-r--r--examples/opengl/legacy/pbuffers2/glwidget.cpp16
-rw-r--r--examples/opengl/legacy/pbuffers2/glwidget.h16
-rw-r--r--examples/opengl/legacy/pbuffers2/main.cpp16
-rw-r--r--examples/opengl/legacy/samplebuffers/glwidget.cpp16
-rw-r--r--examples/opengl/legacy/samplebuffers/glwidget.h16
-rw-r--r--examples/opengl/legacy/samplebuffers/main.cpp16
-rw-r--r--examples/opengl/legacy/shared/qtlogo.cpp16
-rw-r--r--examples/opengl/legacy/shared/qtlogo.h16
-rw-r--r--examples/opengl/paintedwindow/main.cpp16
-rw-r--r--examples/opengl/paintedwindow/paintedwindow.cpp16
-rw-r--r--examples/opengl/paintedwindow/paintedwindow.h16
-rw-r--r--examples/opengl/qopenglwidget/bubble.cpp16
-rw-r--r--examples/opengl/qopenglwidget/bubble.h16
-rw-r--r--examples/opengl/qopenglwidget/glwidget.cpp16
-rw-r--r--examples/opengl/qopenglwidget/glwidget.h16
-rw-r--r--examples/opengl/qopenglwidget/main.cpp16
-rw-r--r--examples/opengl/qopenglwidget/mainwindow.cpp16
-rw-r--r--examples/opengl/qopenglwidget/mainwindow.h16
-rw-r--r--examples/opengl/qopenglwindow/background_renderer.cpp18
-rw-r--r--examples/opengl/qopenglwindow/background_renderer.h16
-rw-r--r--examples/opengl/qopenglwindow/main.cpp16
-rw-r--r--examples/opengl/textures/glwidget.cpp16
-rw-r--r--examples/opengl/textures/glwidget.h16
-rw-r--r--examples/opengl/textures/main.cpp16
-rw-r--r--examples/opengl/textures/window.cpp16
-rw-r--r--examples/opengl/textures/window.h16
-rw-r--r--examples/opengl/threadedqopenglwidget/glwidget.cpp16
-rw-r--r--examples/opengl/threadedqopenglwidget/glwidget.h16
-rw-r--r--examples/opengl/threadedqopenglwidget/main.cpp16
-rw-r--r--examples/opengl/threadedqopenglwidget/mainwindow.cpp16
-rw-r--r--examples/opengl/threadedqopenglwidget/mainwindow.h16
-rw-r--r--examples/qmake/precompile/main.cpp16
-rw-r--r--examples/qmake/precompile/mydialog.cpp16
-rw-r--r--examples/qmake/precompile/mydialog.h16
-rw-r--r--examples/qmake/precompile/myobject.cpp16
-rw-r--r--examples/qmake/precompile/myobject.h16
-rw-r--r--examples/qmake/precompile/stable.h16
-rw-r--r--examples/qmake/precompile/util.cpp16
-rw-r--r--examples/qmake/tutorial/hello.cpp16
-rw-r--r--examples/qmake/tutorial/hello.h16
-rw-r--r--examples/qmake/tutorial/hellounix.cpp16
-rw-r--r--examples/qmake/tutorial/hellowin.cpp16
-rw-r--r--examples/qmake/tutorial/main.cpp16
-rw-r--r--examples/qpa/qrasterwindow/main.cpp16
-rw-r--r--examples/qpa/windows/main.cpp16
-rw-r--r--examples/qpa/windows/window.cpp16
-rw-r--r--examples/qpa/windows/window.h16
-rw-r--r--examples/qtconcurrent/imagescaling/doc/src/qtconcurrent-imagescaling.qdoc10
-rw-r--r--examples/qtconcurrent/imagescaling/imagescaling.cpp16
-rw-r--r--examples/qtconcurrent/imagescaling/imagescaling.h16
-rw-r--r--examples/qtconcurrent/imagescaling/main.cpp16
-rw-r--r--examples/qtconcurrent/map/doc/src/qtconcurrent-map.qdoc10
-rw-r--r--examples/qtconcurrent/map/main.cpp16
-rw-r--r--examples/qtconcurrent/progressdialog/doc/src/qtconcurrent-progressdialog.qdoc10
-rw-r--r--examples/qtconcurrent/progressdialog/main.cpp16
-rw-r--r--examples/qtconcurrent/runfunction/doc/src/qtconcurrent-runfunction.qdoc10
-rw-r--r--examples/qtconcurrent/runfunction/main.cpp16
-rw-r--r--examples/qtconcurrent/wordcount/doc/src/qtconcurrent-wordcount.qdoc10
-rw-r--r--examples/qtconcurrent/wordcount/main.cpp16
-rw-r--r--examples/qtestlib/tutorial1/testqstring.cpp16
-rw-r--r--examples/qtestlib/tutorial2/testqstring.cpp16
-rw-r--r--examples/qtestlib/tutorial3/testgui.cpp16
-rw-r--r--examples/qtestlib/tutorial4/testgui.cpp16
-rw-r--r--examples/qtestlib/tutorial5/benchmarking.cpp16
-rw-r--r--examples/sql/books/bookdelegate.cpp49
-rw-r--r--examples/sql/books/bookdelegate.h49
-rw-r--r--examples/sql/books/bookwindow.cpp49
-rw-r--r--examples/sql/books/bookwindow.h53
-rw-r--r--examples/sql/books/initdb.h49
-rw-r--r--examples/sql/books/main.cpp53
-rw-r--r--examples/sql/cachedtable/main.cpp16
-rw-r--r--examples/sql/cachedtable/tableeditor.cpp16
-rw-r--r--examples/sql/cachedtable/tableeditor.h16
-rw-r--r--examples/sql/connection.h16
-rw-r--r--examples/sql/doc/src/books.qdoc10
-rw-r--r--examples/sql/doc/src/cachedtable.qdoc10
-rw-r--r--examples/sql/doc/src/drilldown.qdoc10
-rw-r--r--examples/sql/doc/src/masterdetail.qdoc10
-rw-r--r--examples/sql/doc/src/querymodel.qdoc10
-rw-r--r--examples/sql/doc/src/relationaltablemodel.qdoc10
-rw-r--r--examples/sql/doc/src/sqlbrowser.qdoc10
-rw-r--r--examples/sql/doc/src/sqlwidgetmapper.qdoc10
-rw-r--r--examples/sql/doc/src/tablemodel.qdoc10
-rw-r--r--examples/sql/drilldown/imageitem.cpp16
-rw-r--r--examples/sql/drilldown/imageitem.h16
-rw-r--r--examples/sql/drilldown/informationwindow.cpp16
-rw-r--r--examples/sql/drilldown/informationwindow.h16
-rw-r--r--examples/sql/drilldown/main.cpp16
-rw-r--r--examples/sql/drilldown/view.cpp16
-rw-r--r--examples/sql/drilldown/view.h16
-rw-r--r--examples/sql/masterdetail/database.h16
-rw-r--r--examples/sql/masterdetail/dialog.cpp16
-rw-r--r--examples/sql/masterdetail/dialog.h16
-rw-r--r--examples/sql/masterdetail/main.cpp16
-rw-r--r--examples/sql/masterdetail/mainwindow.cpp16
-rw-r--r--examples/sql/masterdetail/mainwindow.h16
-rw-r--r--examples/sql/querymodel/customsqlmodel.cpp16
-rw-r--r--examples/sql/querymodel/customsqlmodel.h16
-rw-r--r--examples/sql/querymodel/editablesqlmodel.cpp16
-rw-r--r--examples/sql/querymodel/editablesqlmodel.h16
-rw-r--r--examples/sql/querymodel/main.cpp16
-rw-r--r--examples/sql/relationaltablemodel/relationaltablemodel.cpp16
-rw-r--r--examples/sql/sqlbrowser/browser.cpp49
-rw-r--r--examples/sql/sqlbrowser/browser.h49
-rw-r--r--examples/sql/sqlbrowser/connectionwidget.cpp49
-rw-r--r--examples/sql/sqlbrowser/connectionwidget.h49
-rw-r--r--examples/sql/sqlbrowser/main.cpp49
-rw-r--r--examples/sql/sqlbrowser/qsqlconnectiondialog.cpp49
-rw-r--r--examples/sql/sqlbrowser/qsqlconnectiondialog.h49
-rw-r--r--examples/sql/sqlwidgetmapper/main.cpp16
-rw-r--r--examples/sql/sqlwidgetmapper/window.cpp16
-rw-r--r--examples/sql/sqlwidgetmapper/window.h16
-rw-r--r--examples/sql/tablemodel/tablemodel.cpp16
-rw-r--r--examples/touch/dials/doc/src/touch-dials.qdoc10
-rw-r--r--examples/touch/dials/main.cpp16
-rw-r--r--examples/touch/fingerpaint/main.cpp16
-rw-r--r--examples/touch/fingerpaint/mainwindow.cpp16
-rw-r--r--examples/touch/fingerpaint/mainwindow.h16
-rw-r--r--examples/touch/fingerpaint/scribblearea.cpp16
-rw-r--r--examples/touch/fingerpaint/scribblearea.h16
-rw-r--r--examples/touch/knobs/doc/src/touch-knobs.qdoc10
-rw-r--r--examples/touch/knobs/knob.cpp16
-rw-r--r--examples/touch/knobs/knob.h16
-rw-r--r--examples/touch/knobs/main.cpp16
-rw-r--r--examples/touch/pinchzoom/graphicsview.cpp16
-rw-r--r--examples/touch/pinchzoom/graphicsview.h16
-rw-r--r--examples/touch/pinchzoom/main.cpp16
-rw-r--r--examples/touch/pinchzoom/mouse.cpp16
-rw-r--r--examples/touch/pinchzoom/mouse.h16
-rw-r--r--examples/widgets/animation/animatedtiles/main.cpp16
-rw-r--r--examples/widgets/animation/appchooser/main.cpp16
-rw-r--r--examples/widgets/animation/easing/animation.h16
-rw-r--r--examples/widgets/animation/easing/main.cpp16
-rw-r--r--examples/widgets/animation/easing/window.cpp16
-rw-r--r--examples/widgets/animation/easing/window.h16
-rw-r--r--examples/widgets/animation/moveblocks/main.cpp16
-rw-r--r--examples/widgets/animation/states/main.cpp16
-rw-r--r--examples/widgets/animation/stickman/animation.cpp16
-rw-r--r--examples/widgets/animation/stickman/animation.h16
-rw-r--r--examples/widgets/animation/stickman/graphicsview.cpp16
-rw-r--r--examples/widgets/animation/stickman/graphicsview.h16
-rw-r--r--examples/widgets/animation/stickman/lifecycle.cpp16
-rw-r--r--examples/widgets/animation/stickman/lifecycle.h16
-rw-r--r--examples/widgets/animation/stickman/main.cpp16
-rw-r--r--examples/widgets/animation/stickman/node.cpp16
-rw-r--r--examples/widgets/animation/stickman/node.h16
-rw-r--r--examples/widgets/animation/stickman/rectbutton.cpp16
-rw-r--r--examples/widgets/animation/stickman/rectbutton.h16
-rw-r--r--examples/widgets/animation/stickman/stickman.cpp16
-rw-r--r--examples/widgets/animation/stickman/stickman.h16
-rw-r--r--examples/widgets/animation/sub-attaq/animationmanager.cpp49
-rw-r--r--examples/widgets/animation/sub-attaq/animationmanager.h49
-rw-r--r--examples/widgets/animation/sub-attaq/boat.cpp49
-rw-r--r--examples/widgets/animation/sub-attaq/boat.h49
-rw-r--r--examples/widgets/animation/sub-attaq/boat_p.h49
-rw-r--r--examples/widgets/animation/sub-attaq/bomb.cpp49
-rw-r--r--examples/widgets/animation/sub-attaq/bomb.h53
-rw-r--r--examples/widgets/animation/sub-attaq/graphicsscene.cpp49
-rw-r--r--examples/widgets/animation/sub-attaq/graphicsscene.h49
-rw-r--r--examples/widgets/animation/sub-attaq/main.cpp53
-rw-r--r--examples/widgets/animation/sub-attaq/mainwindow.cpp49
-rw-r--r--examples/widgets/animation/sub-attaq/mainwindow.h53
-rw-r--r--examples/widgets/animation/sub-attaq/pixmapitem.cpp49
-rw-r--r--examples/widgets/animation/sub-attaq/pixmapitem.h53
-rw-r--r--examples/widgets/animation/sub-attaq/progressitem.cpp53
-rw-r--r--examples/widgets/animation/sub-attaq/progressitem.h53
-rw-r--r--examples/widgets/animation/sub-attaq/qanimationstate.cpp49
-rw-r--r--examples/widgets/animation/sub-attaq/qanimationstate.h49
-rw-r--r--examples/widgets/animation/sub-attaq/states.cpp49
-rw-r--r--examples/widgets/animation/sub-attaq/states.h49
-rw-r--r--examples/widgets/animation/sub-attaq/submarine.cpp49
-rw-r--r--examples/widgets/animation/sub-attaq/submarine.h49
-rw-r--r--examples/widgets/animation/sub-attaq/submarine_p.h49
-rw-r--r--examples/widgets/animation/sub-attaq/textinformationitem.cpp53
-rw-r--r--examples/widgets/animation/sub-attaq/textinformationitem.h53
-rw-r--r--examples/widgets/animation/sub-attaq/torpedo.cpp49
-rw-r--r--examples/widgets/animation/sub-attaq/torpedo.h53
-rw-r--r--examples/widgets/desktop/screenshot/main.cpp16
-rw-r--r--examples/widgets/desktop/screenshot/screenshot.cpp16
-rw-r--r--examples/widgets/desktop/screenshot/screenshot.h16
-rw-r--r--examples/widgets/desktop/systray/doc/src/systray.qdoc10
-rw-r--r--examples/widgets/desktop/systray/main.cpp16
-rw-r--r--examples/widgets/desktop/systray/window.cpp16
-rw-r--r--examples/widgets/desktop/systray/window.h16
-rw-r--r--examples/widgets/dialogs/classwizard/classwizard.cpp16
-rw-r--r--examples/widgets/dialogs/classwizard/classwizard.h16
-rw-r--r--examples/widgets/dialogs/classwizard/main.cpp16
-rw-r--r--examples/widgets/dialogs/configdialog/configdialog.cpp16
-rw-r--r--examples/widgets/dialogs/configdialog/configdialog.h16
-rw-r--r--examples/widgets/dialogs/configdialog/main.cpp16
-rw-r--r--examples/widgets/dialogs/configdialog/pages.cpp16
-rw-r--r--examples/widgets/dialogs/configdialog/pages.h16
-rw-r--r--examples/widgets/dialogs/extension/finddialog.cpp16
-rw-r--r--examples/widgets/dialogs/extension/finddialog.h16
-rw-r--r--examples/widgets/dialogs/extension/main.cpp16
-rw-r--r--examples/widgets/dialogs/findfiles/main.cpp16
-rw-r--r--examples/widgets/dialogs/findfiles/window.cpp16
-rw-r--r--examples/widgets/dialogs/findfiles/window.h16
-rw-r--r--examples/widgets/dialogs/licensewizard/licensewizard.cpp16
-rw-r--r--examples/widgets/dialogs/licensewizard/licensewizard.h16
-rw-r--r--examples/widgets/dialogs/licensewizard/main.cpp16
-rw-r--r--examples/widgets/dialogs/sipdialog/dialog.cpp16
-rw-r--r--examples/widgets/dialogs/sipdialog/dialog.h16
-rw-r--r--examples/widgets/dialogs/sipdialog/main.cpp16
-rw-r--r--examples/widgets/dialogs/standarddialogs/dialog.cpp16
-rw-r--r--examples/widgets/dialogs/standarddialogs/dialog.h16
-rw-r--r--examples/widgets/dialogs/standarddialogs/main.cpp16
-rw-r--r--examples/widgets/dialogs/tabdialog/main.cpp16
-rw-r--r--examples/widgets/dialogs/tabdialog/tabdialog.cpp16
-rw-r--r--examples/widgets/dialogs/tabdialog/tabdialog.h16
-rw-r--r--examples/widgets/dialogs/trivialwizard/trivialwizard.cpp16
-rw-r--r--examples/widgets/doc/dropsite.qdoc10
-rw-r--r--examples/widgets/doc/mousebuttons.qdoc12
-rw-r--r--examples/widgets/doc/src/addressbook-tutorial.qdoc10
-rw-r--r--examples/widgets/doc/src/addressbook.qdoc10
-rw-r--r--examples/widgets/doc/src/affine.qdoc10
-rw-r--r--examples/widgets/doc/src/analogclock.qdoc10
-rw-r--r--examples/widgets/doc/src/animatedtiles.qdoc10
-rw-r--r--examples/widgets/doc/src/appchooser.qdoc10
-rw-r--r--examples/widgets/doc/src/application.qdoc10
-rw-r--r--examples/widgets/doc/src/basicdrawing.qdoc10
-rw-r--r--examples/widgets/doc/src/basicgraphicslayouts.qdoc10
-rw-r--r--examples/widgets/doc/src/basiclayouts.qdoc10
-rw-r--r--examples/widgets/doc/src/basicsortfiltermodel.qdoc10
-rw-r--r--examples/widgets/doc/src/blurpicker.qdoc10
-rw-r--r--examples/widgets/doc/src/borderlayout.qdoc10
-rw-r--r--examples/widgets/doc/src/boxes.qdoc10
-rw-r--r--examples/widgets/doc/src/calculator.qdoc10
-rw-r--r--examples/widgets/doc/src/calendar.qdoc10
-rw-r--r--examples/widgets/doc/src/calendarwidget.qdoc10
-rw-r--r--examples/widgets/doc/src/charactermap.qdoc10
-rw-r--r--examples/widgets/doc/src/chart.qdoc10
-rw-r--r--examples/widgets/doc/src/chip.qdoc10
-rw-r--r--examples/widgets/doc/src/classwizard.qdoc10
-rw-r--r--examples/widgets/doc/src/codeeditor.qdoc10
-rw-r--r--examples/widgets/doc/src/collidingmice-example.qdoc10
-rw-r--r--examples/widgets/doc/src/coloreditorfactory.qdoc10
-rw-r--r--examples/widgets/doc/src/combowidgetmapper.qdoc10
-rw-r--r--examples/widgets/doc/src/completer.qdoc10
-rw-r--r--examples/widgets/doc/src/composition.qdoc10
-rw-r--r--examples/widgets/doc/src/concentriccircles.qdoc10
-rw-r--r--examples/widgets/doc/src/configdialog.qdoc10
-rw-r--r--examples/widgets/doc/src/customsortfiltermodel.qdoc10
-rw-r--r--examples/widgets/doc/src/deform.qdoc10
-rw-r--r--examples/widgets/doc/src/diagramscene.qdoc10
-rw-r--r--examples/widgets/doc/src/digitalclock.qdoc10
-rw-r--r--examples/widgets/doc/src/dirview.qdoc10
-rw-r--r--examples/widgets/doc/src/dockwidgets.qdoc10
-rw-r--r--examples/widgets/doc/src/draganddroppuzzle.qdoc10
-rw-r--r--examples/widgets/doc/src/dragdroprobot.qdoc10
-rw-r--r--examples/widgets/doc/src/draggableicons.qdoc10
-rw-r--r--examples/widgets/doc/src/draggabletext.qdoc10
-rw-r--r--examples/widgets/doc/src/dynamiclayouts.qdoc10
-rw-r--r--examples/widgets/doc/src/easing.qdoc10
-rw-r--r--examples/widgets/doc/src/echoplugin.qdoc10
-rw-r--r--examples/widgets/doc/src/editabletreemodel.qdoc10
-rw-r--r--examples/widgets/doc/src/elasticnodes.qdoc10
-rw-r--r--examples/widgets/doc/src/elidedlabel.qdoc10
-rw-r--r--examples/widgets/doc/src/embeddeddialogs.qdoc10
-rw-r--r--examples/widgets/doc/src/eventtransitions.qdoc10
-rw-r--r--examples/widgets/doc/src/extension.qdoc10
-rw-r--r--examples/widgets/doc/src/factorial.qdoc10
-rw-r--r--examples/widgets/doc/src/fademessage.qdoc10
-rw-r--r--examples/widgets/doc/src/fetchmore.qdoc10
-rw-r--r--examples/widgets/doc/src/findfiles.qdoc10
-rw-r--r--examples/widgets/doc/src/flowlayout.qdoc10
-rw-r--r--examples/widgets/doc/src/fontsampler.qdoc10
-rw-r--r--examples/widgets/doc/src/fridgemagnets.qdoc10
-rw-r--r--examples/widgets/doc/src/frozencolumn.qdoc10
-rw-r--r--examples/widgets/doc/src/gradients.qdoc10
-rw-r--r--examples/widgets/doc/src/graphicsview-anchorlayout.qdoc10
-rw-r--r--examples/widgets/doc/src/graphicsview-flowlayout.qdoc10
-rw-r--r--examples/widgets/doc/src/graphicsview-simpleanchorlayout.qdoc10
-rw-r--r--examples/widgets/doc/src/graphicsview-weatheranchorlayout.qdoc10
-rw-r--r--examples/widgets/doc/src/groupbox.qdoc10
-rw-r--r--examples/widgets/doc/src/i18n.qdoc10
-rw-r--r--examples/widgets/doc/src/icons.qdoc10
-rw-r--r--examples/widgets/doc/src/imagecomposition.qdoc10
-rw-r--r--examples/widgets/doc/src/imageviewer.qdoc10
-rw-r--r--examples/widgets/doc/src/interview.qdoc10
-rw-r--r--examples/widgets/doc/src/itemviewspuzzle.qdoc10
-rw-r--r--examples/widgets/doc/src/licensewizard.qdoc10
-rw-r--r--examples/widgets/doc/src/lighting.qdoc10
-rw-r--r--examples/widgets/doc/src/lineedits.qdoc10
-rw-r--r--examples/widgets/doc/src/mainwindow.qdoc10
-rw-r--r--examples/widgets/doc/src/mdi.qdoc10
-rw-r--r--examples/widgets/doc/src/menus.qdoc10
-rw-r--r--examples/widgets/doc/src/moveblocks.qdoc10
-rw-r--r--examples/widgets/doc/src/movie.qdoc10
-rw-r--r--examples/widgets/doc/src/orderform.qdoc10
-rw-r--r--examples/widgets/doc/src/padnavigator.qdoc10
-rw-r--r--examples/widgets/doc/src/painterpaths.qdoc10
-rw-r--r--examples/widgets/doc/src/pathstroke.qdoc10
-rw-r--r--examples/widgets/doc/src/pingpong.qdoc10
-rw-r--r--examples/widgets/doc/src/pixelator.qdoc10
-rw-r--r--examples/widgets/doc/src/plugandpaint.qdoc10
-rw-r--r--examples/widgets/doc/src/regexp.qdoc10
-rw-r--r--examples/widgets/doc/src/regularexpression.qdoc10
-rw-r--r--examples/widgets/doc/src/rogue.qdoc10
-rw-r--r--examples/widgets/doc/src/screenshot.qdoc10
-rw-r--r--examples/widgets/doc/src/scribble.qdoc10
-rw-r--r--examples/widgets/doc/src/sdi.qdoc10
-rw-r--r--examples/widgets/doc/src/settingseditor.qdoc10
-rw-r--r--examples/widgets/doc/src/shapedclock.qdoc10
-rw-r--r--examples/widgets/doc/src/simpledommodel.qdoc10
-rw-r--r--examples/widgets/doc/src/simpletreemodel.qdoc10
-rw-r--r--examples/widgets/doc/src/simplewidgetmapper.qdoc10
-rw-r--r--examples/widgets/doc/src/sipdialog.qdoc10
-rw-r--r--examples/widgets/doc/src/sliders.qdoc10
-rw-r--r--examples/widgets/doc/src/spinboxdelegate.qdoc10
-rw-r--r--examples/widgets/doc/src/spinboxes.qdoc10
-rw-r--r--examples/widgets/doc/src/spreadsheet.qdoc10
-rw-r--r--examples/widgets/doc/src/standarddialogs.qdoc10
-rw-r--r--examples/widgets/doc/src/stardelegate.qdoc10
-rw-r--r--examples/widgets/doc/src/states.qdoc10
-rw-r--r--examples/widgets/doc/src/stickman.qdoc10
-rw-r--r--examples/widgets/doc/src/styleplugin.qdoc10
-rw-r--r--examples/widgets/doc/src/styles.qdoc10
-rw-r--r--examples/widgets/doc/src/stylesheet.qdoc10
-rw-r--r--examples/widgets/doc/src/sub-attaq.qdoc10
-rw-r--r--examples/widgets/doc/src/syntaxhighlighter.qdoc10
-rw-r--r--examples/widgets/doc/src/tabdialog.qdoc10
-rw-r--r--examples/widgets/doc/src/tablet.qdoc10
-rw-r--r--examples/widgets/doc/src/tetrix.qdoc10
-rw-r--r--examples/widgets/doc/src/textedit.qdoc10
-rw-r--r--examples/widgets/doc/src/tooltips.qdoc10
-rw-r--r--examples/widgets/doc/src/trafficlight.qdoc10
-rw-r--r--examples/widgets/doc/src/transformations.qdoc10
-rw-r--r--examples/widgets/doc/src/treemodelcompleter.qdoc10
-rw-r--r--examples/widgets/doc/src/trivialwizard.qdoc10
-rw-r--r--examples/widgets/doc/src/twowaybutton.qdoc10
-rw-r--r--examples/widgets/doc/src/undo.qdoc10
-rw-r--r--examples/widgets/doc/src/undoframework.qdoc10
-rw-r--r--examples/widgets/doc/src/validators.qdoc10
-rw-r--r--examples/widgets/doc/src/wiggly.qdoc10
-rw-r--r--examples/widgets/doc/src/windowflags.qdoc10
-rw-r--r--examples/widgets/draganddrop/draggableicons/dragwidget.cpp16
-rw-r--r--examples/widgets/draganddrop/draggableicons/dragwidget.h16
-rw-r--r--examples/widgets/draganddrop/draggableicons/main.cpp16
-rw-r--r--examples/widgets/draganddrop/draggabletext/dragwidget.cpp16
-rw-r--r--examples/widgets/draganddrop/draggabletext/dragwidget.h16
-rw-r--r--examples/widgets/draganddrop/draggabletext/main.cpp16
-rw-r--r--examples/widgets/draganddrop/dropsite/droparea.cpp16
-rw-r--r--examples/widgets/draganddrop/dropsite/droparea.h16
-rw-r--r--examples/widgets/draganddrop/dropsite/dropsitewindow.cpp16
-rw-r--r--examples/widgets/draganddrop/dropsite/dropsitewindow.h16
-rw-r--r--examples/widgets/draganddrop/dropsite/main.cpp16
-rw-r--r--examples/widgets/draganddrop/fridgemagnets/draglabel.cpp16
-rw-r--r--examples/widgets/draganddrop/fridgemagnets/draglabel.h16
-rw-r--r--examples/widgets/draganddrop/fridgemagnets/dragwidget.cpp16
-rw-r--r--examples/widgets/draganddrop/fridgemagnets/dragwidget.h16
-rw-r--r--examples/widgets/draganddrop/fridgemagnets/main.cpp16
-rw-r--r--examples/widgets/draganddrop/puzzle/main.cpp16
-rw-r--r--examples/widgets/draganddrop/puzzle/mainwindow.cpp16
-rw-r--r--examples/widgets/draganddrop/puzzle/mainwindow.h16
-rw-r--r--examples/widgets/draganddrop/puzzle/pieceslist.cpp16
-rw-r--r--examples/widgets/draganddrop/puzzle/pieceslist.h16
-rw-r--r--examples/widgets/draganddrop/puzzle/puzzlewidget.cpp16
-rw-r--r--examples/widgets/draganddrop/puzzle/puzzlewidget.h16
-rw-r--r--examples/widgets/effects/blurpicker/blureffect.cpp16
-rw-r--r--examples/widgets/effects/blurpicker/blureffect.h16
-rw-r--r--examples/widgets/effects/blurpicker/blurpicker.cpp16
-rw-r--r--examples/widgets/effects/blurpicker/blurpicker.h16
-rw-r--r--examples/widgets/effects/blurpicker/main.cpp16
-rw-r--r--examples/widgets/effects/fademessage/fademessage.cpp16
-rw-r--r--examples/widgets/effects/fademessage/fademessage.h16
-rw-r--r--examples/widgets/effects/fademessage/main.cpp16
-rw-r--r--examples/widgets/effects/lighting/lighting.cpp16
-rw-r--r--examples/widgets/effects/lighting/lighting.h16
-rw-r--r--examples/widgets/effects/lighting/main.cpp16
-rw-r--r--examples/widgets/gestures/imagegestures/doc/src/imagegestures.qdoc10
-rw-r--r--examples/widgets/gestures/imagegestures/imagewidget.cpp16
-rw-r--r--examples/widgets/gestures/imagegestures/imagewidget.h16
-rw-r--r--examples/widgets/gestures/imagegestures/main.cpp16
-rw-r--r--examples/widgets/gestures/imagegestures/mainwidget.cpp16
-rw-r--r--examples/widgets/gestures/imagegestures/mainwidget.h16
-rw-r--r--examples/widgets/graphicsview/anchorlayout/main.cpp16
-rw-r--r--examples/widgets/graphicsview/basicgraphicslayouts/layoutitem.cpp16
-rw-r--r--examples/widgets/graphicsview/basicgraphicslayouts/layoutitem.h16
-rw-r--r--examples/widgets/graphicsview/basicgraphicslayouts/main.cpp16
-rw-r--r--examples/widgets/graphicsview/basicgraphicslayouts/window.cpp16
-rw-r--r--examples/widgets/graphicsview/basicgraphicslayouts/window.h16
-rw-r--r--examples/widgets/graphicsview/boxes/basic.fsh49
-rw-r--r--examples/widgets/graphicsview/boxes/basic.vsh53
-rw-r--r--examples/widgets/graphicsview/boxes/dotted.fsh53
-rw-r--r--examples/widgets/graphicsview/boxes/fresnel.fsh49
-rw-r--r--examples/widgets/graphicsview/boxes/glass.fsh49
-rw-r--r--examples/widgets/graphicsview/boxes/glbuffers.cpp49
-rw-r--r--examples/widgets/graphicsview/boxes/glbuffers.h49
-rw-r--r--examples/widgets/graphicsview/boxes/glextensions.cpp49
-rw-r--r--examples/widgets/graphicsview/boxes/glextensions.h49
-rw-r--r--examples/widgets/graphicsview/boxes/gltrianglemesh.h49
-rw-r--r--examples/widgets/graphicsview/boxes/granite.fsh49
-rw-r--r--examples/widgets/graphicsview/boxes/main.cpp49
-rw-r--r--examples/widgets/graphicsview/boxes/marble.fsh53
-rw-r--r--examples/widgets/graphicsview/boxes/qtbox.cpp49
-rw-r--r--examples/widgets/graphicsview/boxes/qtbox.h49
-rw-r--r--examples/widgets/graphicsview/boxes/reflection.fsh53
-rw-r--r--examples/widgets/graphicsview/boxes/refraction.fsh53
-rw-r--r--examples/widgets/graphicsview/boxes/roundedbox.cpp49
-rw-r--r--examples/widgets/graphicsview/boxes/roundedbox.h49
-rw-r--r--examples/widgets/graphicsview/boxes/scene.cpp49
-rw-r--r--examples/widgets/graphicsview/boxes/scene.h49
-rw-r--r--examples/widgets/graphicsview/boxes/trackball.cpp49
-rw-r--r--examples/widgets/graphicsview/boxes/trackball.h49
-rw-r--r--examples/widgets/graphicsview/boxes/wood.fsh53
-rw-r--r--examples/widgets/graphicsview/chip/chip.cpp49
-rw-r--r--examples/widgets/graphicsview/chip/chip.h53
-rw-r--r--examples/widgets/graphicsview/chip/main.cpp53
-rw-r--r--examples/widgets/graphicsview/chip/mainwindow.cpp51
-rw-r--r--examples/widgets/graphicsview/chip/mainwindow.h53
-rw-r--r--examples/widgets/graphicsview/chip/view.cpp51
-rw-r--r--examples/widgets/graphicsview/chip/view.h49
-rw-r--r--examples/widgets/graphicsview/collidingmice/main.cpp16
-rw-r--r--examples/widgets/graphicsview/collidingmice/mouse.cpp16
-rw-r--r--examples/widgets/graphicsview/collidingmice/mouse.h16
-rw-r--r--examples/widgets/graphicsview/diagramscene/arrow.cpp16
-rw-r--r--examples/widgets/graphicsview/diagramscene/arrow.h16
-rw-r--r--examples/widgets/graphicsview/diagramscene/diagramitem.cpp16
-rw-r--r--examples/widgets/graphicsview/diagramscene/diagramitem.h16
-rw-r--r--examples/widgets/graphicsview/diagramscene/diagramscene.cpp16
-rw-r--r--examples/widgets/graphicsview/diagramscene/diagramscene.h16
-rw-r--r--examples/widgets/graphicsview/diagramscene/diagramtextitem.cpp16
-rw-r--r--examples/widgets/graphicsview/diagramscene/diagramtextitem.h16
-rw-r--r--examples/widgets/graphicsview/diagramscene/main.cpp16
-rw-r--r--examples/widgets/graphicsview/diagramscene/mainwindow.cpp16
-rw-r--r--examples/widgets/graphicsview/diagramscene/mainwindow.h16
-rw-r--r--examples/widgets/graphicsview/dragdroprobot/coloritem.cpp16
-rw-r--r--examples/widgets/graphicsview/dragdroprobot/coloritem.h16
-rw-r--r--examples/widgets/graphicsview/dragdroprobot/main.cpp16
-rw-r--r--examples/widgets/graphicsview/dragdroprobot/robot.cpp16
-rw-r--r--examples/widgets/graphicsview/dragdroprobot/robot.h16
-rw-r--r--examples/widgets/graphicsview/elasticnodes/edge.cpp16
-rw-r--r--examples/widgets/graphicsview/elasticnodes/edge.h16
-rw-r--r--examples/widgets/graphicsview/elasticnodes/graphwidget.cpp16
-rw-r--r--examples/widgets/graphicsview/elasticnodes/graphwidget.h16
-rw-r--r--examples/widgets/graphicsview/elasticnodes/main.cpp16
-rw-r--r--examples/widgets/graphicsview/elasticnodes/node.cpp16
-rw-r--r--examples/widgets/graphicsview/elasticnodes/node.h16
-rw-r--r--examples/widgets/graphicsview/embeddeddialogs/customproxy.cpp49
-rw-r--r--examples/widgets/graphicsview/embeddeddialogs/customproxy.h49
-rw-r--r--examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.cpp49
-rw-r--r--examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.h53
-rw-r--r--examples/widgets/graphicsview/embeddeddialogs/main.cpp49
-rw-r--r--examples/widgets/graphicsview/flowlayout/flowlayout.cpp16
-rw-r--r--examples/widgets/graphicsview/flowlayout/flowlayout.h16
-rw-r--r--examples/widgets/graphicsview/flowlayout/main.cpp16
-rw-r--r--examples/widgets/graphicsview/flowlayout/window.cpp16
-rw-r--r--examples/widgets/graphicsview/flowlayout/window.h16
-rw-r--r--examples/widgets/graphicsview/padnavigator/flippablepad.cpp16
-rw-r--r--examples/widgets/graphicsview/padnavigator/flippablepad.h16
-rw-r--r--examples/widgets/graphicsview/padnavigator/main.cpp16
-rw-r--r--examples/widgets/graphicsview/padnavigator/padnavigator.cpp16
-rw-r--r--examples/widgets/graphicsview/padnavigator/padnavigator.h16
-rw-r--r--examples/widgets/graphicsview/padnavigator/roundrectitem.cpp16
-rw-r--r--examples/widgets/graphicsview/padnavigator/roundrectitem.h16
-rw-r--r--examples/widgets/graphicsview/padnavigator/splashitem.cpp16
-rw-r--r--examples/widgets/graphicsview/padnavigator/splashitem.h16
-rw-r--r--examples/widgets/graphicsview/simpleanchorlayout/main.cpp16
-rw-r--r--examples/widgets/graphicsview/weatheranchorlayout/main.cpp16
-rw-r--r--examples/widgets/itemviews/addressbook/adddialog.cpp16
-rw-r--r--examples/widgets/itemviews/addressbook/adddialog.h16
-rw-r--r--examples/widgets/itemviews/addressbook/addresswidget.cpp16
-rw-r--r--examples/widgets/itemviews/addressbook/addresswidget.h16
-rw-r--r--examples/widgets/itemviews/addressbook/main.cpp16
-rw-r--r--examples/widgets/itemviews/addressbook/mainwindow.cpp16
-rw-r--r--examples/widgets/itemviews/addressbook/mainwindow.h16
-rw-r--r--examples/widgets/itemviews/addressbook/newaddresstab.cpp16
-rw-r--r--examples/widgets/itemviews/addressbook/newaddresstab.h16
-rw-r--r--examples/widgets/itemviews/addressbook/tablemodel.cpp16
-rw-r--r--examples/widgets/itemviews/addressbook/tablemodel.h16
-rw-r--r--examples/widgets/itemviews/basicsortfiltermodel/main.cpp16
-rw-r--r--examples/widgets/itemviews/basicsortfiltermodel/window.cpp16
-rw-r--r--examples/widgets/itemviews/basicsortfiltermodel/window.h16
-rw-r--r--examples/widgets/itemviews/chart/main.cpp16
-rw-r--r--examples/widgets/itemviews/chart/mainwindow.cpp16
-rw-r--r--examples/widgets/itemviews/chart/mainwindow.h16
-rw-r--r--examples/widgets/itemviews/chart/pieview.cpp16
-rw-r--r--examples/widgets/itemviews/chart/pieview.h16
-rw-r--r--examples/widgets/itemviews/coloreditorfactory/colorlisteditor.cpp16
-rw-r--r--examples/widgets/itemviews/coloreditorfactory/colorlisteditor.h16
-rw-r--r--examples/widgets/itemviews/coloreditorfactory/main.cpp16
-rw-r--r--examples/widgets/itemviews/coloreditorfactory/window.cpp16
-rw-r--r--examples/widgets/itemviews/coloreditorfactory/window.h16
-rw-r--r--examples/widgets/itemviews/combowidgetmapper/main.cpp16
-rw-r--r--examples/widgets/itemviews/combowidgetmapper/window.cpp16
-rw-r--r--examples/widgets/itemviews/combowidgetmapper/window.h16
-rw-r--r--examples/widgets/itemviews/customsortfiltermodel/filterwidget.cpp16
-rw-r--r--examples/widgets/itemviews/customsortfiltermodel/filterwidget.h16
-rw-r--r--examples/widgets/itemviews/customsortfiltermodel/main.cpp16
-rw-r--r--examples/widgets/itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp16
-rw-r--r--examples/widgets/itemviews/customsortfiltermodel/mysortfilterproxymodel.h16
-rw-r--r--examples/widgets/itemviews/customsortfiltermodel/window.cpp16
-rw-r--r--examples/widgets/itemviews/customsortfiltermodel/window.h16
-rw-r--r--examples/widgets/itemviews/dirview/main.cpp16
-rw-r--r--examples/widgets/itemviews/editabletreemodel/main.cpp16
-rw-r--r--examples/widgets/itemviews/editabletreemodel/mainwindow.cpp16
-rw-r--r--examples/widgets/itemviews/editabletreemodel/mainwindow.h16
-rw-r--r--examples/widgets/itemviews/editabletreemodel/treeitem.cpp16
-rw-r--r--examples/widgets/itemviews/editabletreemodel/treeitem.h16
-rw-r--r--examples/widgets/itemviews/editabletreemodel/treemodel.cpp16
-rw-r--r--examples/widgets/itemviews/editabletreemodel/treemodel.h16
-rw-r--r--examples/widgets/itemviews/fetchmore/filelistmodel.cpp16
-rw-r--r--examples/widgets/itemviews/fetchmore/filelistmodel.h16
-rw-r--r--examples/widgets/itemviews/fetchmore/main.cpp16
-rw-r--r--examples/widgets/itemviews/fetchmore/window.cpp16
-rw-r--r--examples/widgets/itemviews/fetchmore/window.h16
-rw-r--r--examples/widgets/itemviews/frozencolumn/freezetablewidget.cpp16
-rw-r--r--examples/widgets/itemviews/frozencolumn/freezetablewidget.h16
-rw-r--r--examples/widgets/itemviews/frozencolumn/main.cpp16
-rw-r--r--examples/widgets/itemviews/interview/main.cpp49
-rw-r--r--examples/widgets/itemviews/interview/model.cpp49
-rw-r--r--examples/widgets/itemviews/interview/model.h49
-rw-r--r--examples/widgets/itemviews/pixelator/imagemodel.cpp16
-rw-r--r--examples/widgets/itemviews/pixelator/imagemodel.h16
-rw-r--r--examples/widgets/itemviews/pixelator/main.cpp16
-rw-r--r--examples/widgets/itemviews/pixelator/mainwindow.cpp16
-rw-r--r--examples/widgets/itemviews/pixelator/mainwindow.h16
-rw-r--r--examples/widgets/itemviews/pixelator/pixeldelegate.cpp16
-rw-r--r--examples/widgets/itemviews/pixelator/pixeldelegate.h16
-rw-r--r--examples/widgets/itemviews/puzzle/main.cpp16
-rw-r--r--examples/widgets/itemviews/puzzle/mainwindow.cpp16
-rw-r--r--examples/widgets/itemviews/puzzle/mainwindow.h16
-rw-r--r--examples/widgets/itemviews/puzzle/piecesmodel.cpp16
-rw-r--r--examples/widgets/itemviews/puzzle/piecesmodel.h16
-rw-r--r--examples/widgets/itemviews/puzzle/puzzlewidget.cpp16
-rw-r--r--examples/widgets/itemviews/puzzle/puzzlewidget.h16
-rw-r--r--examples/widgets/itemviews/simpledommodel/domitem.cpp16
-rw-r--r--examples/widgets/itemviews/simpledommodel/domitem.h16
-rw-r--r--examples/widgets/itemviews/simpledommodel/dommodel.cpp16
-rw-r--r--examples/widgets/itemviews/simpledommodel/dommodel.h16
-rw-r--r--examples/widgets/itemviews/simpledommodel/main.cpp16
-rw-r--r--examples/widgets/itemviews/simpledommodel/mainwindow.cpp16
-rw-r--r--examples/widgets/itemviews/simpledommodel/mainwindow.h16
-rw-r--r--examples/widgets/itemviews/simpletreemodel/main.cpp16
-rw-r--r--examples/widgets/itemviews/simpletreemodel/treeitem.cpp16
-rw-r--r--examples/widgets/itemviews/simpletreemodel/treeitem.h16
-rw-r--r--examples/widgets/itemviews/simpletreemodel/treemodel.cpp16
-rw-r--r--examples/widgets/itemviews/simpletreemodel/treemodel.h16
-rw-r--r--examples/widgets/itemviews/simplewidgetmapper/main.cpp16
-rw-r--r--examples/widgets/itemviews/simplewidgetmapper/window.cpp16
-rw-r--r--examples/widgets/itemviews/simplewidgetmapper/window.h16
-rw-r--r--examples/widgets/itemviews/spinboxdelegate/delegate.cpp16
-rw-r--r--examples/widgets/itemviews/spinboxdelegate/delegate.h16
-rw-r--r--examples/widgets/itemviews/spinboxdelegate/main.cpp16
-rw-r--r--examples/widgets/itemviews/spreadsheet/main.cpp53
-rw-r--r--examples/widgets/itemviews/spreadsheet/printview.cpp53
-rw-r--r--examples/widgets/itemviews/spreadsheet/printview.h53
-rw-r--r--examples/widgets/itemviews/spreadsheet/spreadsheet.cpp49
-rw-r--r--examples/widgets/itemviews/spreadsheet/spreadsheet.h49
-rw-r--r--examples/widgets/itemviews/spreadsheet/spreadsheetdelegate.cpp49
-rw-r--r--examples/widgets/itemviews/spreadsheet/spreadsheetdelegate.h53
-rw-r--r--examples/widgets/itemviews/spreadsheet/spreadsheetitem.cpp49
-rw-r--r--examples/widgets/itemviews/spreadsheet/spreadsheetitem.h49
-rw-r--r--examples/widgets/itemviews/stardelegate/main.cpp16
-rw-r--r--examples/widgets/itemviews/stardelegate/stardelegate.cpp16
-rw-r--r--examples/widgets/itemviews/stardelegate/stardelegate.h16
-rw-r--r--examples/widgets/itemviews/stardelegate/stareditor.cpp16
-rw-r--r--examples/widgets/itemviews/stardelegate/stareditor.h16
-rw-r--r--examples/widgets/itemviews/stardelegate/starrating.cpp16
-rw-r--r--examples/widgets/itemviews/stardelegate/starrating.h16
-rw-r--r--examples/widgets/itemviews/storageview/main.cpp18
-rw-r--r--examples/widgets/itemviews/storageview/storagemodel.cpp18
-rw-r--r--examples/widgets/itemviews/storageview/storagemodel.h18
-rw-r--r--examples/widgets/layouts/basiclayouts/dialog.cpp16
-rw-r--r--examples/widgets/layouts/basiclayouts/dialog.h16
-rw-r--r--examples/widgets/layouts/basiclayouts/main.cpp16
-rw-r--r--examples/widgets/layouts/borderlayout/borderlayout.cpp16
-rw-r--r--examples/widgets/layouts/borderlayout/borderlayout.h16
-rw-r--r--examples/widgets/layouts/borderlayout/main.cpp16
-rw-r--r--examples/widgets/layouts/borderlayout/window.cpp16
-rw-r--r--examples/widgets/layouts/borderlayout/window.h16
-rw-r--r--examples/widgets/layouts/dynamiclayouts/dialog.cpp16
-rw-r--r--examples/widgets/layouts/dynamiclayouts/dialog.h16
-rw-r--r--examples/widgets/layouts/dynamiclayouts/main.cpp16
-rw-r--r--examples/widgets/layouts/flowlayout/flowlayout.cpp16
-rw-r--r--examples/widgets/layouts/flowlayout/flowlayout.h16
-rw-r--r--examples/widgets/layouts/flowlayout/main.cpp16
-rw-r--r--examples/widgets/layouts/flowlayout/window.cpp16
-rw-r--r--examples/widgets/layouts/flowlayout/window.h16
-rw-r--r--examples/widgets/mac/qmaccocoaviewcontainer/main.mm55
-rw-r--r--examples/widgets/mac/qmaccocoaviewcontainer/qmaccocoaviewcontainer.pro2
-rw-r--r--examples/widgets/mac/qmacnativewidget/main.mm51
-rw-r--r--examples/widgets/mac/qmacnativewidget/qmacnativewidget.pro2
-rw-r--r--examples/widgets/mainwindows/application/main.cpp16
-rw-r--r--examples/widgets/mainwindows/application/mainwindow.cpp16
-rw-r--r--examples/widgets/mainwindows/application/mainwindow.h16
-rw-r--r--examples/widgets/mainwindows/dockwidgets/main.cpp16
-rw-r--r--examples/widgets/mainwindows/dockwidgets/mainwindow.cpp16
-rw-r--r--examples/widgets/mainwindows/dockwidgets/mainwindow.h16
-rw-r--r--examples/widgets/mainwindows/mainwindow/colorswatch.cpp51
-rw-r--r--examples/widgets/mainwindows/mainwindow/colorswatch.h51
-rw-r--r--examples/widgets/mainwindows/mainwindow/main.cpp49
-rw-r--r--examples/widgets/mainwindows/mainwindow/mainwindow.cpp49
-rw-r--r--examples/widgets/mainwindows/mainwindow/mainwindow.h49
-rw-r--r--examples/widgets/mainwindows/mainwindow/toolbar.cpp49
-rw-r--r--examples/widgets/mainwindows/mainwindow/toolbar.h49
-rw-r--r--examples/widgets/mainwindows/mdi/main.cpp16
-rw-r--r--examples/widgets/mainwindows/mdi/mainwindow.cpp16
-rw-r--r--examples/widgets/mainwindows/mdi/mainwindow.h16
-rw-r--r--examples/widgets/mainwindows/mdi/mdichild.cpp16
-rw-r--r--examples/widgets/mainwindows/mdi/mdichild.h16
-rw-r--r--examples/widgets/mainwindows/menus/main.cpp16
-rw-r--r--examples/widgets/mainwindows/menus/mainwindow.cpp18
-rw-r--r--examples/widgets/mainwindows/menus/mainwindow.h18
-rw-r--r--examples/widgets/mainwindows/sdi/main.cpp16
-rw-r--r--examples/widgets/mainwindows/sdi/mainwindow.cpp16
-rw-r--r--examples/widgets/mainwindows/sdi/mainwindow.h16
-rw-r--r--examples/widgets/painting/affine/main.cpp53
-rw-r--r--examples/widgets/painting/affine/xform.cpp49
-rw-r--r--examples/widgets/painting/affine/xform.h49
-rw-r--r--examples/widgets/painting/basicdrawing/main.cpp16
-rw-r--r--examples/widgets/painting/basicdrawing/renderarea.cpp16
-rw-r--r--examples/widgets/painting/basicdrawing/renderarea.h16
-rw-r--r--examples/widgets/painting/basicdrawing/window.cpp16
-rw-r--r--examples/widgets/painting/basicdrawing/window.h16
-rw-r--r--examples/widgets/painting/composition/composition.cpp49
-rw-r--r--examples/widgets/painting/composition/composition.h49
-rw-r--r--examples/widgets/painting/composition/main.cpp53
-rw-r--r--examples/widgets/painting/concentriccircles/circlewidget.cpp16
-rw-r--r--examples/widgets/painting/concentriccircles/circlewidget.h16
-rw-r--r--examples/widgets/painting/concentriccircles/main.cpp16
-rw-r--r--examples/widgets/painting/concentriccircles/window.cpp16
-rw-r--r--examples/widgets/painting/concentriccircles/window.h16
-rw-r--r--examples/widgets/painting/deform/main.cpp53
-rw-r--r--examples/widgets/painting/deform/pathdeform.cpp49
-rw-r--r--examples/widgets/painting/deform/pathdeform.h49
-rw-r--r--examples/widgets/painting/fontsampler/main.cpp16
-rw-r--r--examples/widgets/painting/fontsampler/mainwindow.cpp16
-rw-r--r--examples/widgets/painting/fontsampler/mainwindow.h16
-rw-r--r--examples/widgets/painting/gradients/gradients.cpp49
-rw-r--r--examples/widgets/painting/gradients/gradients.h49
-rw-r--r--examples/widgets/painting/gradients/main.cpp53
-rw-r--r--examples/widgets/painting/imagecomposition/imagecomposer.cpp16
-rw-r--r--examples/widgets/painting/imagecomposition/imagecomposer.h16
-rw-r--r--examples/widgets/painting/imagecomposition/main.cpp16
-rw-r--r--examples/widgets/painting/painterpaths/main.cpp16
-rw-r--r--examples/widgets/painting/painterpaths/renderarea.cpp16
-rw-r--r--examples/widgets/painting/painterpaths/renderarea.h16
-rw-r--r--examples/widgets/painting/painterpaths/window.cpp16
-rw-r--r--examples/widgets/painting/painterpaths/window.h16
-rw-r--r--examples/widgets/painting/pathstroke/main.cpp49
-rw-r--r--examples/widgets/painting/pathstroke/pathstroke.cpp49
-rw-r--r--examples/widgets/painting/pathstroke/pathstroke.h49
-rw-r--r--examples/widgets/painting/shared/arthurstyle.cpp49
-rw-r--r--examples/widgets/painting/shared/arthurstyle.h49
-rw-r--r--examples/widgets/painting/shared/arthurwidgets.cpp49
-rw-r--r--examples/widgets/painting/shared/arthurwidgets.h49
-rw-r--r--examples/widgets/painting/shared/hoverpoints.cpp49
-rw-r--r--examples/widgets/painting/shared/hoverpoints.h49
-rw-r--r--examples/widgets/painting/transformations/main.cpp16
-rw-r--r--examples/widgets/painting/transformations/renderarea.cpp16
-rw-r--r--examples/widgets/painting/transformations/renderarea.h16
-rw-r--r--examples/widgets/painting/transformations/window.cpp16
-rw-r--r--examples/widgets/painting/transformations/window.h16
-rw-r--r--examples/widgets/richtext/calendar/main.cpp16
-rw-r--r--examples/widgets/richtext/calendar/mainwindow.cpp16
-rw-r--r--examples/widgets/richtext/calendar/mainwindow.h16
-rw-r--r--examples/widgets/richtext/orderform/detailsdialog.cpp16
-rw-r--r--examples/widgets/richtext/orderform/detailsdialog.h16
-rw-r--r--examples/widgets/richtext/orderform/main.cpp16
-rw-r--r--examples/widgets/richtext/orderform/mainwindow.cpp16
-rw-r--r--examples/widgets/richtext/orderform/mainwindow.h16
-rw-r--r--examples/widgets/richtext/syntaxhighlighter/highlighter.cpp16
-rw-r--r--examples/widgets/richtext/syntaxhighlighter/highlighter.h16
-rw-r--r--examples/widgets/richtext/syntaxhighlighter/main.cpp16
-rw-r--r--examples/widgets/richtext/syntaxhighlighter/mainwindow.cpp16
-rw-r--r--examples/widgets/richtext/syntaxhighlighter/mainwindow.h16
-rw-r--r--examples/widgets/richtext/textedit/main.cpp49
-rw-r--r--examples/widgets/richtext/textedit/textedit.cpp49
-rw-r--r--examples/widgets/richtext/textedit/textedit.h49
-rw-r--r--examples/widgets/richtext/textedit/textedit.qdoc10
-rw-r--r--examples/widgets/scroller/graphicsview/main.cpp16
-rw-r--r--examples/widgets/statemachine/eventtransitions/main.cpp16
-rw-r--r--examples/widgets/statemachine/factorial/main.cpp16
-rw-r--r--examples/widgets/statemachine/pingpong/main.cpp16
-rw-r--r--examples/widgets/statemachine/rogue/main.cpp16
-rw-r--r--examples/widgets/statemachine/rogue/movementtransition.h16
-rw-r--r--examples/widgets/statemachine/rogue/window.cpp16
-rw-r--r--examples/widgets/statemachine/rogue/window.h16
-rw-r--r--examples/widgets/statemachine/trafficlight/main.cpp16
-rw-r--r--examples/widgets/statemachine/twowaybutton/main.cpp16
-rw-r--r--examples/widgets/tools/codecs/doc/src/codecs.qdoc10
-rw-r--r--examples/widgets/tools/codecs/main.cpp16
-rw-r--r--examples/widgets/tools/codecs/mainwindow.cpp16
-rw-r--r--examples/widgets/tools/codecs/mainwindow.h16
-rw-r--r--examples/widgets/tools/codecs/previewform.cpp16
-rw-r--r--examples/widgets/tools/codecs/previewform.h16
-rw-r--r--examples/widgets/tools/completer/fsmodel.cpp16
-rw-r--r--examples/widgets/tools/completer/fsmodel.h16
-rw-r--r--examples/widgets/tools/completer/main.cpp16
-rw-r--r--examples/widgets/tools/completer/mainwindow.cpp16
-rw-r--r--examples/widgets/tools/completer/mainwindow.h16
-rw-r--r--examples/widgets/tools/customcompleter/doc/src/customcompleter.qdoc10
-rw-r--r--examples/widgets/tools/customcompleter/main.cpp16
-rw-r--r--examples/widgets/tools/customcompleter/mainwindow.cpp16
-rw-r--r--examples/widgets/tools/customcompleter/mainwindow.h16
-rw-r--r--examples/widgets/tools/customcompleter/textedit.cpp16
-rw-r--r--examples/widgets/tools/customcompleter/textedit.h16
-rw-r--r--examples/widgets/tools/echoplugin/echowindow/echointerface.h16
-rw-r--r--examples/widgets/tools/echoplugin/echowindow/echowindow.cpp16
-rw-r--r--examples/widgets/tools/echoplugin/echowindow/echowindow.h16
-rw-r--r--examples/widgets/tools/echoplugin/echowindow/main.cpp16
-rw-r--r--examples/widgets/tools/echoplugin/plugin/echoplugin.cpp16
-rw-r--r--examples/widgets/tools/echoplugin/plugin/echoplugin.h16
-rw-r--r--examples/widgets/tools/i18n/languagechooser.cpp16
-rw-r--r--examples/widgets/tools/i18n/languagechooser.h16
-rw-r--r--examples/widgets/tools/i18n/main.cpp16
-rw-r--r--examples/widgets/tools/i18n/mainwindow.cpp16
-rw-r--r--examples/widgets/tools/i18n/mainwindow.h16
-rw-r--r--examples/widgets/tools/plugandpaint/app/interfaces.h16
-rw-r--r--examples/widgets/tools/plugandpaint/app/main.cpp16
-rw-r--r--examples/widgets/tools/plugandpaint/app/mainwindow.cpp16
-rw-r--r--examples/widgets/tools/plugandpaint/app/mainwindow.h16
-rw-r--r--examples/widgets/tools/plugandpaint/app/paintarea.cpp16
-rw-r--r--examples/widgets/tools/plugandpaint/app/paintarea.h16
-rw-r--r--examples/widgets/tools/plugandpaint/app/plugindialog.cpp16
-rw-r--r--examples/widgets/tools/plugandpaint/app/plugindialog.h16
-rw-r--r--examples/widgets/tools/plugandpaint/plugins/basictools/basictoolsplugin.cpp16
-rw-r--r--examples/widgets/tools/plugandpaint/plugins/basictools/basictoolsplugin.h16
-rw-r--r--examples/widgets/tools/plugandpaint/plugins/extrafilters/extrafiltersplugin.cpp16
-rw-r--r--examples/widgets/tools/plugandpaint/plugins/extrafilters/extrafiltersplugin.h16
-rw-r--r--examples/widgets/tools/regexp/main.cpp16
-rw-r--r--examples/widgets/tools/regexp/regexpdialog.cpp16
-rw-r--r--examples/widgets/tools/regexp/regexpdialog.h16
-rw-r--r--examples/widgets/tools/regularexpression/main.cpp16
-rw-r--r--examples/widgets/tools/regularexpression/regularexpressiondialog.cpp20
-rw-r--r--examples/widgets/tools/regularexpression/regularexpressiondialog.h20
-rw-r--r--examples/widgets/tools/settingseditor/locationdialog.cpp16
-rw-r--r--examples/widgets/tools/settingseditor/locationdialog.h16
-rw-r--r--examples/widgets/tools/settingseditor/main.cpp16
-rw-r--r--examples/widgets/tools/settingseditor/mainwindow.cpp16
-rw-r--r--examples/widgets/tools/settingseditor/mainwindow.h16
-rw-r--r--examples/widgets/tools/settingseditor/settingstree.cpp16
-rw-r--r--examples/widgets/tools/settingseditor/settingstree.h16
-rw-r--r--examples/widgets/tools/settingseditor/variantdelegate.cpp16
-rw-r--r--examples/widgets/tools/settingseditor/variantdelegate.h16
-rw-r--r--examples/widgets/tools/styleplugin/plugin/simplestyle.cpp16
-rw-r--r--examples/widgets/tools/styleplugin/plugin/simplestyle.h16
-rw-r--r--examples/widgets/tools/styleplugin/plugin/simplestyleplugin.cpp16
-rw-r--r--examples/widgets/tools/styleplugin/plugin/simplestyleplugin.h16
-rw-r--r--examples/widgets/tools/styleplugin/stylewindow/main.cpp16
-rw-r--r--examples/widgets/tools/styleplugin/stylewindow/stylewindow.cpp16
-rw-r--r--examples/widgets/tools/styleplugin/stylewindow/stylewindow.h16
-rw-r--r--examples/widgets/tools/tools.pro7
-rw-r--r--examples/widgets/tools/treemodelcompleter/main.cpp16
-rw-r--r--examples/widgets/tools/treemodelcompleter/mainwindow.cpp16
-rw-r--r--examples/widgets/tools/treemodelcompleter/mainwindow.h16
-rw-r--r--examples/widgets/tools/treemodelcompleter/treemodelcompleter.cpp16
-rw-r--r--examples/widgets/tools/treemodelcompleter/treemodelcompleter.h16
-rw-r--r--examples/widgets/tools/undo/commands.cpp49
-rw-r--r--examples/widgets/tools/undo/commands.h49
-rw-r--r--examples/widgets/tools/undo/document.cpp49
-rw-r--r--examples/widgets/tools/undo/document.h49
-rw-r--r--examples/widgets/tools/undo/main.cpp53
-rw-r--r--examples/widgets/tools/undo/mainwindow.cpp49
-rw-r--r--examples/widgets/tools/undo/mainwindow.h49
-rw-r--r--examples/widgets/tools/undoframework/commands.cpp16
-rw-r--r--examples/widgets/tools/undoframework/commands.h16
-rw-r--r--examples/widgets/tools/undoframework/diagramitem.cpp16
-rw-r--r--examples/widgets/tools/undoframework/diagramitem.h16
-rw-r--r--examples/widgets/tools/undoframework/diagramscene.cpp16
-rw-r--r--examples/widgets/tools/undoframework/diagramscene.h16
-rw-r--r--examples/widgets/tools/undoframework/main.cpp16
-rw-r--r--examples/widgets/tools/undoframework/mainwindow.cpp16
-rw-r--r--examples/widgets/tools/undoframework/mainwindow.h16
-rw-r--r--examples/widgets/tutorials/addressbook/part1/addressbook.cpp16
-rw-r--r--examples/widgets/tutorials/addressbook/part1/addressbook.h16
-rw-r--r--examples/widgets/tutorials/addressbook/part1/main.cpp16
-rw-r--r--examples/widgets/tutorials/addressbook/part2/addressbook.cpp16
-rw-r--r--examples/widgets/tutorials/addressbook/part2/addressbook.h16
-rw-r--r--examples/widgets/tutorials/addressbook/part2/main.cpp16
-rw-r--r--examples/widgets/tutorials/addressbook/part3/addressbook.cpp16
-rw-r--r--examples/widgets/tutorials/addressbook/part3/addressbook.h16
-rw-r--r--examples/widgets/tutorials/addressbook/part3/main.cpp16
-rw-r--r--examples/widgets/tutorials/addressbook/part4/addressbook.cpp16
-rw-r--r--examples/widgets/tutorials/addressbook/part4/addressbook.h16
-rw-r--r--examples/widgets/tutorials/addressbook/part4/main.cpp16
-rw-r--r--examples/widgets/tutorials/addressbook/part5/addressbook.cpp16
-rw-r--r--examples/widgets/tutorials/addressbook/part5/addressbook.h16
-rw-r--r--examples/widgets/tutorials/addressbook/part5/finddialog.cpp16
-rw-r--r--examples/widgets/tutorials/addressbook/part5/finddialog.h16
-rw-r--r--examples/widgets/tutorials/addressbook/part5/main.cpp16
-rw-r--r--examples/widgets/tutorials/addressbook/part6/addressbook.cpp16
-rw-r--r--examples/widgets/tutorials/addressbook/part6/addressbook.h16
-rw-r--r--examples/widgets/tutorials/addressbook/part6/finddialog.cpp16
-rw-r--r--examples/widgets/tutorials/addressbook/part6/finddialog.h16
-rw-r--r--examples/widgets/tutorials/addressbook/part6/main.cpp16
-rw-r--r--examples/widgets/tutorials/addressbook/part7/addressbook.cpp16
-rw-r--r--examples/widgets/tutorials/addressbook/part7/addressbook.h16
-rw-r--r--examples/widgets/tutorials/addressbook/part7/finddialog.cpp16
-rw-r--r--examples/widgets/tutorials/addressbook/part7/finddialog.h16
-rw-r--r--examples/widgets/tutorials/addressbook/part7/main.cpp16
-rw-r--r--examples/widgets/tutorials/gettingStarted/gsQt/part1/main.cpp16
-rw-r--r--examples/widgets/tutorials/gettingStarted/gsQt/part2/main.cpp16
-rw-r--r--examples/widgets/tutorials/gettingStarted/gsQt/part3/main.cpp16
-rw-r--r--examples/widgets/tutorials/gettingStarted/gsQt/part4/main.cpp16
-rw-r--r--examples/widgets/tutorials/gettingStarted/gsQt/part5/main.cpp16
-rw-r--r--examples/widgets/tutorials/modelview/1_readonly/main.cpp16
-rw-r--r--examples/widgets/tutorials/modelview/1_readonly/mymodel.cpp16
-rw-r--r--examples/widgets/tutorials/modelview/1_readonly/mymodel.h16
-rw-r--r--examples/widgets/tutorials/modelview/2_formatting/main.cpp16
-rw-r--r--examples/widgets/tutorials/modelview/2_formatting/mymodel.cpp16
-rw-r--r--examples/widgets/tutorials/modelview/2_formatting/mymodel.h16
-rw-r--r--examples/widgets/tutorials/modelview/3_changingmodel/main.cpp16
-rw-r--r--examples/widgets/tutorials/modelview/3_changingmodel/mymodel.cpp16
-rw-r--r--examples/widgets/tutorials/modelview/3_changingmodel/mymodel.h16
-rw-r--r--examples/widgets/tutorials/modelview/4_headers/main.cpp16
-rw-r--r--examples/widgets/tutorials/modelview/4_headers/mymodel.cpp16
-rw-r--r--examples/widgets/tutorials/modelview/4_headers/mymodel.h16
-rw-r--r--examples/widgets/tutorials/modelview/5_edit/main.cpp16
-rw-r--r--examples/widgets/tutorials/modelview/5_edit/mainwindow.cpp16
-rw-r--r--examples/widgets/tutorials/modelview/5_edit/mainwindow.h16
-rw-r--r--examples/widgets/tutorials/modelview/5_edit/mymodel.cpp16
-rw-r--r--examples/widgets/tutorials/modelview/5_edit/mymodel.h16
-rw-r--r--examples/widgets/tutorials/modelview/6_treeview/main.cpp16
-rw-r--r--examples/widgets/tutorials/modelview/6_treeview/mainwindow.cpp16
-rw-r--r--examples/widgets/tutorials/modelview/6_treeview/mainwindow.h16
-rw-r--r--examples/widgets/tutorials/modelview/7_selections/main.cpp16
-rw-r--r--examples/widgets/tutorials/modelview/7_selections/mainwindow.cpp16
-rw-r--r--examples/widgets/tutorials/modelview/7_selections/mainwindow.h16
-rw-r--r--examples/widgets/tutorials/widgets/childwidget/main.cpp16
-rw-r--r--examples/widgets/tutorials/widgets/nestedlayouts/main.cpp16
-rw-r--r--examples/widgets/tutorials/widgets/toplevel/main.cpp16
-rw-r--r--examples/widgets/tutorials/widgets/windowlayout/main.cpp16
-rw-r--r--examples/widgets/widgets/analogclock/analogclock.cpp16
-rw-r--r--examples/widgets/widgets/analogclock/analogclock.h16
-rw-r--r--examples/widgets/widgets/analogclock/main.cpp16
-rw-r--r--examples/widgets/widgets/calculator/button.cpp16
-rw-r--r--examples/widgets/widgets/calculator/button.h16
-rw-r--r--examples/widgets/widgets/calculator/calculator.cpp16
-rw-r--r--examples/widgets/widgets/calculator/calculator.h16
-rw-r--r--examples/widgets/widgets/calculator/main.cpp16
-rw-r--r--examples/widgets/widgets/calendarwidget/main.cpp16
-rw-r--r--examples/widgets/widgets/calendarwidget/window.cpp16
-rw-r--r--examples/widgets/widgets/calendarwidget/window.h16
-rw-r--r--examples/widgets/widgets/charactermap/characterwidget.cpp16
-rw-r--r--examples/widgets/widgets/charactermap/characterwidget.h16
-rw-r--r--examples/widgets/widgets/charactermap/main.cpp16
-rw-r--r--examples/widgets/widgets/charactermap/mainwindow.cpp16
-rw-r--r--examples/widgets/widgets/charactermap/mainwindow.h16
-rw-r--r--examples/widgets/widgets/codeeditor/codeeditor.cpp16
-rw-r--r--examples/widgets/widgets/codeeditor/codeeditor.h16
-rw-r--r--examples/widgets/widgets/codeeditor/main.cpp16
-rw-r--r--examples/widgets/widgets/digitalclock/digitalclock.cpp16
-rw-r--r--examples/widgets/widgets/digitalclock/digitalclock.h16
-rw-r--r--examples/widgets/widgets/digitalclock/main.cpp16
-rw-r--r--examples/widgets/widgets/elidedlabel/elidedlabel.cpp16
-rw-r--r--examples/widgets/widgets/elidedlabel/elidedlabel.h16
-rw-r--r--examples/widgets/widgets/elidedlabel/main.cpp16
-rw-r--r--examples/widgets/widgets/elidedlabel/testwidget.cpp16
-rw-r--r--examples/widgets/widgets/elidedlabel/testwidget.h16
-rw-r--r--examples/widgets/widgets/groupbox/main.cpp16
-rw-r--r--examples/widgets/widgets/groupbox/window.cpp16
-rw-r--r--examples/widgets/widgets/groupbox/window.h16
-rw-r--r--examples/widgets/widgets/icons/iconpreviewarea.cpp16
-rw-r--r--examples/widgets/widgets/icons/iconpreviewarea.h16
-rw-r--r--examples/widgets/widgets/icons/iconsizespinbox.cpp16
-rw-r--r--examples/widgets/widgets/icons/iconsizespinbox.h16
-rw-r--r--examples/widgets/widgets/icons/imagedelegate.cpp16
-rw-r--r--examples/widgets/widgets/icons/imagedelegate.h16
-rw-r--r--examples/widgets/widgets/icons/main.cpp16
-rw-r--r--examples/widgets/widgets/icons/mainwindow.cpp16
-rw-r--r--examples/widgets/widgets/icons/mainwindow.h16
-rw-r--r--examples/widgets/widgets/imageviewer/imageviewer.cpp16
-rw-r--r--examples/widgets/widgets/imageviewer/imageviewer.h16
-rw-r--r--examples/widgets/widgets/imageviewer/main.cpp16
-rw-r--r--examples/widgets/widgets/lineedits/main.cpp16
-rw-r--r--examples/widgets/widgets/lineedits/window.cpp16
-rw-r--r--examples/widgets/widgets/lineedits/window.h16
-rw-r--r--examples/widgets/widgets/mousebuttons/buttontester.cpp18
-rw-r--r--examples/widgets/widgets/mousebuttons/buttontester.h18
-rw-r--r--examples/widgets/widgets/mousebuttons/main.cpp18
-rw-r--r--examples/widgets/widgets/movie/main.cpp16
-rw-r--r--examples/widgets/widgets/movie/movieplayer.cpp16
-rw-r--r--examples/widgets/widgets/movie/movieplayer.h16
-rw-r--r--examples/widgets/widgets/scribble/main.cpp16
-rw-r--r--examples/widgets/widgets/scribble/mainwindow.cpp16
-rw-r--r--examples/widgets/widgets/scribble/mainwindow.h16
-rw-r--r--examples/widgets/widgets/scribble/scribblearea.cpp16
-rw-r--r--examples/widgets/widgets/scribble/scribblearea.h16
-rw-r--r--examples/widgets/widgets/shapedclock/main.cpp16
-rw-r--r--examples/widgets/widgets/shapedclock/shapedclock.cpp16
-rw-r--r--examples/widgets/widgets/shapedclock/shapedclock.h16
-rw-r--r--examples/widgets/widgets/sliders/main.cpp16
-rw-r--r--examples/widgets/widgets/sliders/slidersgroup.cpp16
-rw-r--r--examples/widgets/widgets/sliders/slidersgroup.h16
-rw-r--r--examples/widgets/widgets/sliders/window.cpp16
-rw-r--r--examples/widgets/widgets/sliders/window.h16
-rw-r--r--examples/widgets/widgets/spinboxes/main.cpp16
-rw-r--r--examples/widgets/widgets/spinboxes/window.cpp16
-rw-r--r--examples/widgets/widgets/spinboxes/window.h16
-rw-r--r--examples/widgets/widgets/styles/main.cpp16
-rw-r--r--examples/widgets/widgets/styles/norwegianwoodstyle.cpp16
-rw-r--r--examples/widgets/widgets/styles/norwegianwoodstyle.h16
-rw-r--r--examples/widgets/widgets/styles/widgetgallery.cpp16
-rw-r--r--examples/widgets/widgets/styles/widgetgallery.h16
-rw-r--r--examples/widgets/widgets/stylesheet/main.cpp16
-rw-r--r--examples/widgets/widgets/stylesheet/mainwindow.cpp16
-rw-r--r--examples/widgets/widgets/stylesheet/mainwindow.h16
-rw-r--r--examples/widgets/widgets/stylesheet/stylesheeteditor.cpp16
-rw-r--r--examples/widgets/widgets/stylesheet/stylesheeteditor.h16
-rw-r--r--examples/widgets/widgets/tablet/main.cpp16
-rw-r--r--examples/widgets/widgets/tablet/mainwindow.cpp16
-rw-r--r--examples/widgets/widgets/tablet/mainwindow.h16
-rw-r--r--examples/widgets/widgets/tablet/tabletapplication.cpp16
-rw-r--r--examples/widgets/widgets/tablet/tabletapplication.h16
-rw-r--r--examples/widgets/widgets/tablet/tabletcanvas.cpp17
-rw-r--r--examples/widgets/widgets/tablet/tabletcanvas.h16
-rw-r--r--examples/widgets/widgets/tetrix/main.cpp16
-rw-r--r--examples/widgets/widgets/tetrix/tetrixboard.cpp16
-rw-r--r--examples/widgets/widgets/tetrix/tetrixboard.h16
-rw-r--r--examples/widgets/widgets/tetrix/tetrixpiece.cpp16
-rw-r--r--examples/widgets/widgets/tetrix/tetrixpiece.h16
-rw-r--r--examples/widgets/widgets/tetrix/tetrixwindow.cpp16
-rw-r--r--examples/widgets/widgets/tetrix/tetrixwindow.h16
-rw-r--r--examples/widgets/widgets/tooltips/main.cpp16
-rw-r--r--examples/widgets/widgets/tooltips/shapeitem.cpp16
-rw-r--r--examples/widgets/widgets/tooltips/shapeitem.h16
-rw-r--r--examples/widgets/widgets/tooltips/sortingbox.cpp16
-rw-r--r--examples/widgets/widgets/tooltips/sortingbox.h16
-rw-r--r--examples/widgets/widgets/validators/ledwidget.cpp16
-rw-r--r--examples/widgets/widgets/validators/ledwidget.h16
-rw-r--r--examples/widgets/widgets/validators/localeselector.cpp16
-rw-r--r--examples/widgets/widgets/validators/localeselector.h16
-rw-r--r--examples/widgets/widgets/validators/main.cpp16
-rw-r--r--examples/widgets/widgets/wiggly/dialog.cpp16
-rw-r--r--examples/widgets/widgets/wiggly/dialog.h16
-rw-r--r--examples/widgets/widgets/wiggly/main.cpp16
-rw-r--r--examples/widgets/widgets/wiggly/wigglywidget.cpp16
-rw-r--r--examples/widgets/widgets/wiggly/wigglywidget.h16
-rw-r--r--examples/widgets/widgets/windowflags/controllerwindow.cpp16
-rw-r--r--examples/widgets/widgets/windowflags/controllerwindow.h16
-rw-r--r--examples/widgets/widgets/windowflags/main.cpp16
-rw-r--r--examples/widgets/widgets/windowflags/previewwindow.cpp16
-rw-r--r--examples/widgets/widgets/windowflags/previewwindow.h16
-rw-r--r--examples/widgets/windowcontainer/windowcontainer.cpp16
-rw-r--r--examples/xml/dombookmarks/doc/src/dombookmarks.qdoc10
-rw-r--r--examples/xml/dombookmarks/main.cpp16
-rw-r--r--examples/xml/dombookmarks/mainwindow.cpp16
-rw-r--r--examples/xml/dombookmarks/mainwindow.h16
-rw-r--r--examples/xml/dombookmarks/xbeltree.cpp16
-rw-r--r--examples/xml/dombookmarks/xbeltree.h16
-rw-r--r--examples/xml/htmlinfo/main.cpp16
-rw-r--r--examples/xml/rsslisting/main.cpp16
-rw-r--r--examples/xml/rsslisting/rsslisting.cpp16
-rw-r--r--examples/xml/rsslisting/rsslisting.h16
-rw-r--r--examples/xml/saxbookmarks/doc/src/saxbookmarks.qdoc10
-rw-r--r--examples/xml/saxbookmarks/main.cpp16
-rw-r--r--examples/xml/saxbookmarks/mainwindow.cpp16
-rw-r--r--examples/xml/saxbookmarks/mainwindow.h16
-rw-r--r--examples/xml/saxbookmarks/xbelgenerator.cpp16
-rw-r--r--examples/xml/saxbookmarks/xbelgenerator.h16
-rw-r--r--examples/xml/saxbookmarks/xbelhandler.cpp16
-rw-r--r--examples/xml/saxbookmarks/xbelhandler.h16
-rw-r--r--examples/xml/streambookmarks/doc/src/qxmlstreambookmarks.qdoc10
-rw-r--r--examples/xml/streambookmarks/main.cpp16
-rw-r--r--examples/xml/streambookmarks/mainwindow.cpp16
-rw-r--r--examples/xml/streambookmarks/mainwindow.h16
-rw-r--r--examples/xml/streambookmarks/xbelreader.cpp16
-rw-r--r--examples/xml/streambookmarks/xbelreader.h16
-rw-r--r--examples/xml/streambookmarks/xbelwriter.cpp16
-rw-r--r--examples/xml/streambookmarks/xbelwriter.h16
-rw-r--r--examples/xml/xmlstreamlint/doc/src/xmlstreamlint.qdoc10
-rw-r--r--examples/xml/xmlstreamlint/main.cpp16
1247 files changed, 18248 insertions, 6151 deletions
diff --git a/examples/corelib/corelib.pro b/examples/corelib/corelib.pro
index ec6e19c2b5..a32b8ba51a 100644
--- a/examples/corelib/corelib.pro
+++ b/examples/corelib/corelib.pro
@@ -4,5 +4,6 @@ CONFIG += no_docs_target
SUBDIRS = \
ipc \
json \
+ mimetypes \
threads \
tools
diff --git a/examples/corelib/ipc/doc/src/localfortuneclient.qdoc b/examples/corelib/ipc/doc/src/localfortuneclient.qdoc
index 48cca96a91..0ccc1f3a4e 100644
--- a/examples/corelib/ipc/doc/src/localfortuneclient.qdoc
+++ b/examples/corelib/ipc/doc/src/localfortuneclient.qdoc
@@ -1,7 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
**
@@ -11,8 +11,8 @@
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
** Foundation and appearing in the file included in the packaging of
** this file. Please review the following information to ensure
** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/examples/corelib/ipc/doc/src/localfortuneserver.qdoc b/examples/corelib/ipc/doc/src/localfortuneserver.qdoc
index 340c8d54e1..8d44c99617 100644
--- a/examples/corelib/ipc/doc/src/localfortuneserver.qdoc
+++ b/examples/corelib/ipc/doc/src/localfortuneserver.qdoc
@@ -1,7 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
**
@@ -11,8 +11,8 @@
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
** Foundation and appearing in the file included in the packaging of
** this file. Please review the following information to ensure
** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/examples/corelib/ipc/doc/src/sharedmemory.qdoc b/examples/corelib/ipc/doc/src/sharedmemory.qdoc
index 80c0f16006..fb2ae21812 100644
--- a/examples/corelib/ipc/doc/src/sharedmemory.qdoc
+++ b/examples/corelib/ipc/doc/src/sharedmemory.qdoc
@@ -1,7 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
**
@@ -11,8 +11,8 @@
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
** Foundation and appearing in the file included in the packaging of
** this file. Please review the following information to ensure
** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/examples/corelib/ipc/ipc.pro b/examples/corelib/ipc/ipc.pro
index 987df7afc7..65ee98a2cf 100644
--- a/examples/corelib/ipc/ipc.pro
+++ b/examples/corelib/ipc/ipc.pro
@@ -2,5 +2,5 @@ requires(qtHaveModule(widgets))
TEMPLATE = subdirs
# no QSharedMemory
-!vxworks:SUBDIRS = sharedmemory
+!vxworks:!integrity: SUBDIRS = sharedmemory
!wince:qtHaveModule(network): SUBDIRS += localfortuneserver localfortuneclient
diff --git a/examples/corelib/ipc/localfortuneclient/client.cpp b/examples/corelib/ipc/localfortuneclient/client.cpp
index 853cb2b087..122522f29d 100644
--- a/examples/corelib/ipc/localfortuneclient/client.cpp
+++ b/examples/corelib/ipc/localfortuneclient/client.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/corelib/ipc/localfortuneclient/client.h b/examples/corelib/ipc/localfortuneclient/client.h
index f12957fe33..0400389989 100644
--- a/examples/corelib/ipc/localfortuneclient/client.h
+++ b/examples/corelib/ipc/localfortuneclient/client.h
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/corelib/ipc/localfortuneclient/main.cpp b/examples/corelib/ipc/localfortuneclient/main.cpp
index 17051871db..dd13a05be9 100644
--- a/examples/corelib/ipc/localfortuneclient/main.cpp
+++ b/examples/corelib/ipc/localfortuneclient/main.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/corelib/ipc/localfortuneserver/main.cpp b/examples/corelib/ipc/localfortuneserver/main.cpp
index 589bb5e339..cd066a0acd 100644
--- a/examples/corelib/ipc/localfortuneserver/main.cpp
+++ b/examples/corelib/ipc/localfortuneserver/main.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/corelib/ipc/localfortuneserver/server.cpp b/examples/corelib/ipc/localfortuneserver/server.cpp
index 5b64e917d9..753f629e6a 100644
--- a/examples/corelib/ipc/localfortuneserver/server.cpp
+++ b/examples/corelib/ipc/localfortuneserver/server.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/corelib/ipc/localfortuneserver/server.h b/examples/corelib/ipc/localfortuneserver/server.h
index fdafdacc90..c77b4e8127 100644
--- a/examples/corelib/ipc/localfortuneserver/server.h
+++ b/examples/corelib/ipc/localfortuneserver/server.h
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/corelib/ipc/sharedmemory/dialog.cpp b/examples/corelib/ipc/sharedmemory/dialog.cpp
index 46d50ba01e..ce5a4547bb 100644
--- a/examples/corelib/ipc/sharedmemory/dialog.cpp
+++ b/examples/corelib/ipc/sharedmemory/dialog.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/corelib/ipc/sharedmemory/dialog.h b/examples/corelib/ipc/sharedmemory/dialog.h
index ea6573e573..1662654441 100644
--- a/examples/corelib/ipc/sharedmemory/dialog.h
+++ b/examples/corelib/ipc/sharedmemory/dialog.h
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/corelib/ipc/sharedmemory/main.cpp b/examples/corelib/ipc/sharedmemory/main.cpp
index 240d04201a..080f92c001 100644
--- a/examples/corelib/ipc/sharedmemory/main.cpp
+++ b/examples/corelib/ipc/sharedmemory/main.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/corelib/json/savegame/character.cpp b/examples/corelib/json/savegame/character.cpp
index a4b58aabb4..20bbc34961 100644
--- a/examples/corelib/json/savegame/character.cpp
+++ b/examples/corelib/json/savegame/character.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/corelib/json/savegame/character.h b/examples/corelib/json/savegame/character.h
index c8f1a71327..740496822c 100644
--- a/examples/corelib/json/savegame/character.h
+++ b/examples/corelib/json/savegame/character.h
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/corelib/json/savegame/doc/src/savegame.qdoc b/examples/corelib/json/savegame/doc/src/savegame.qdoc
index a3eaa50433..fec5fe8e5d 100644
--- a/examples/corelib/json/savegame/doc/src/savegame.qdoc
+++ b/examples/corelib/json/savegame/doc/src/savegame.qdoc
@@ -1,7 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
**
@@ -11,8 +11,8 @@
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
** Foundation and appearing in the file included in the packaging of
** this file. Please review the following information to ensure
** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/examples/corelib/json/savegame/game.cpp b/examples/corelib/json/savegame/game.cpp
index c4ec23d689..b0d800f4ab 100644
--- a/examples/corelib/json/savegame/game.cpp
+++ b/examples/corelib/json/savegame/game.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/corelib/json/savegame/game.h b/examples/corelib/json/savegame/game.h
index 62f3e13650..c02832b0ab 100644
--- a/examples/corelib/json/savegame/game.h
+++ b/examples/corelib/json/savegame/game.h
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/corelib/json/savegame/level.cpp b/examples/corelib/json/savegame/level.cpp
index 26b1bcc9e5..5b9fb5c90a 100644
--- a/examples/corelib/json/savegame/level.cpp
+++ b/examples/corelib/json/savegame/level.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/corelib/json/savegame/level.h b/examples/corelib/json/savegame/level.h
index 3f5ad22962..878510e9d5 100644
--- a/examples/corelib/json/savegame/level.h
+++ b/examples/corelib/json/savegame/level.h
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/corelib/json/savegame/main.cpp b/examples/corelib/json/savegame/main.cpp
index 02f0660f27..2e4e864942 100644
--- a/examples/corelib/json/savegame/main.cpp
+++ b/examples/corelib/json/savegame/main.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/corelib/mimetypes/doc/images/mimetypebrowser.png b/examples/corelib/mimetypes/doc/images/mimetypebrowser.png
new file mode 100644
index 0000000000..28e8c4cf5d
--- /dev/null
+++ b/examples/corelib/mimetypes/doc/images/mimetypebrowser.png
Binary files differ
diff --git a/examples/corelib/mimetypes/doc/src/mimetypebrowser.qdoc b/examples/corelib/mimetypes/doc/src/mimetypebrowser.qdoc
new file mode 100644
index 0000000000..7b204db51a
--- /dev/null
+++ b/examples/corelib/mimetypes/doc/src/mimetypebrowser.qdoc
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+ \example mimetypes/mimetypebrowser
+ \ingroup examples-mimetype
+ \title MIME Type Browser Example
+
+ \brief Shows the hierarchy of MIME types and
+ can be used to determine the MIME type of a file.
+
+ \image mimetypebrowser.png Screenshot of the MIME Type Browser Example
+
+ \e {MIME Type Browser} is intended to be a tool for exploring MIME types
+ rather than an example showing the typical usage of Qt's MIME API.
+
+ \include examples-run.qdocinc
+
+ \section1 Main Window
+
+ The main window consists of a tree view displaying the hierarchy of MIME types
+ based on the model MimetypeModel inheriting QStandardItemModel on the left and
+ a QTextBrowser for showing detailed information about the selected MIME type
+ on the right.
+
+ It has a main menu with an option \uicontrol{File/Detect File Type}, which
+ lets you pick a file and then displays its MIME type.
+
+ For more information, see QMimeType and QMimeDatabase.
+*/
diff --git a/examples/corelib/mimetypes/mimetypebrowser/main.cpp b/examples/corelib/mimetypes/mimetypebrowser/main.cpp
new file mode 100644
index 0000000000..daa92a2344
--- /dev/null
+++ b/examples/corelib/mimetypes/mimetypebrowser/main.cpp
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of The Qt Company Ltd nor the names of its
+** contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "mainwindow.h"
+
+#include <QApplication>
+#include <QDesktopWidget>
+
+#include <QCommandLineParser>
+#include <QCommandLineOption>
+#include <QDebug>
+#include <QMimeDatabase>
+#include <QMimeType>
+
+int main(int argc, char *argv[])
+{
+ QApplication app(argc, argv);
+ QCoreApplication::setApplicationVersion(QT_VERSION_STR);
+
+ QCommandLineParser parser;
+ parser.addHelpOption();
+ parser.addVersionOption();
+
+ parser.process(app);
+
+ MainWindow mainWindow;
+ const QRect availableGeometry = QApplication::desktop()->availableGeometry(&mainWindow);
+ mainWindow.resize(availableGeometry.width() / 3, availableGeometry.height() / 2);
+ mainWindow.show();
+
+ return app.exec();
+}
diff --git a/examples/corelib/mimetypes/mimetypebrowser/mainwindow.cpp b/examples/corelib/mimetypes/mimetypebrowser/mainwindow.cpp
new file mode 100644
index 0000000000..edd48021f3
--- /dev/null
+++ b/examples/corelib/mimetypes/mimetypebrowser/mainwindow.cpp
@@ -0,0 +1,185 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of The Qt Company Ltd nor the names of its
+** contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "mainwindow.h"
+#include "mimetypemodel.h"
+
+#include <QAction>
+#include <QApplication>
+#include <QFileDialog>
+#include <QInputDialog>
+#include <QMenu>
+#include <QMenuBar>
+#include <QMessageBox>
+#include <QPlainTextEdit>
+#include <QSplitter>
+#include <QStatusBar>
+#include <QTextEdit>
+#include <QTreeView>
+
+#include <QFileInfo>
+#include <QItemSelectionModel>
+#include <QMimeDatabase>
+#include <QMimeType>
+
+MainWindow::MainWindow(QWidget *parent)
+ : QMainWindow(parent)
+ , m_model(new MimetypeModel(this))
+ , m_treeView(new QTreeView)
+ , m_detailsText(new QTextEdit)
+ , m_findIndex(0)
+{
+ setWindowTitle(tr("Qt Mime Database Browser"));
+
+ QMenu *fileMenu = menuBar()->addMenu(tr("&File"));
+ QAction *detectFileAction =
+ fileMenu->addAction(tr("&Detect File Type..."), this, &MainWindow::detectFile);
+ detectFileAction->setShortcuts(QKeySequence::Open);
+
+ QAction *exitAction = fileMenu->addAction(tr("E&xit"), qApp, &QApplication::closeAllWindows);
+ exitAction->setShortcuts(QKeySequence::Quit);
+
+ QMenu *findMenu = menuBar()->addMenu(tr("&Edit"));
+ QAction *findAction =
+ findMenu->addAction(tr("&Find..."), this, &MainWindow::find);
+ findAction->setShortcuts(QKeySequence::Find);
+ m_findNextAction = findMenu->addAction(tr("Find &Next"), this, &MainWindow::findNext);
+ m_findNextAction->setShortcuts(QKeySequence::FindNext);
+ m_findPreviousAction = findMenu->addAction(tr("Find &Previous"), this, &MainWindow::findPrevious);
+ m_findPreviousAction->setShortcuts(QKeySequence::FindPrevious);
+
+ menuBar()->addMenu(tr("&About"))->addAction(tr("&About Qt"), qApp, &QApplication::aboutQt);
+
+ QSplitter *centralSplitter = new QSplitter;
+ setCentralWidget(centralSplitter);
+ m_treeView = new QTreeView;
+ m_treeView->setUniformRowHeights(true);
+ m_treeView->setModel(m_model);
+
+ const auto items = m_model->findItems("application/octet-stream", Qt::MatchContains | Qt::MatchFixedString | Qt::MatchRecursive);
+ if (!items.isEmpty())
+ m_treeView->expand(m_model->indexFromItem(items.constFirst()));
+
+ connect(m_treeView->selectionModel(), &QItemSelectionModel::currentChanged,
+ this, &MainWindow::currentChanged);
+ centralSplitter->addWidget(m_treeView);
+ m_detailsText->setReadOnly(true);
+ centralSplitter->addWidget(m_detailsText);
+
+ updateFindActions();
+}
+
+void MainWindow::currentChanged(const QModelIndex &index)
+{
+ if (index.isValid())
+ m_detailsText->setText(MimetypeModel::formatMimeTypeInfo(m_model->mimeType(index)));
+ else
+ m_detailsText->clear();
+}
+
+void MainWindow::selectAndGoTo(const QModelIndex &index)
+{
+ m_treeView->scrollTo(index, QAbstractItemView::PositionAtCenter);
+ m_treeView->setCurrentIndex(index);
+}
+
+void MainWindow::detectFile()
+{
+ const QString fileName = QFileDialog::getOpenFileName(this, tr("Choose File"));
+ if (fileName.isEmpty())
+ return;
+ QMimeDatabase mimeDatabase;
+ const QFileInfo fi(fileName);
+ const QMimeType mimeType = mimeDatabase.mimeTypeForFile(fi);
+ const QModelIndex index = mimeType.isValid()
+ ? m_model->indexForMimeType(mimeType.name()) : QModelIndex();
+ if (index.isValid()) {
+ statusBar()->showMessage(tr("\"%1\" is of type \"%2\"").arg(fi.fileName(), mimeType.name()));
+ selectAndGoTo(index);
+ } else {
+ QMessageBox::information(this, tr("Unknown File Type"),
+ tr("The type of %1 could not be determined.")
+ .arg(QDir::toNativeSeparators(fileName)));
+ }
+}
+
+void MainWindow::updateFindActions()
+{
+ const bool findNextPreviousEnabled = m_findMatches.size() > 1;
+ m_findNextAction->setEnabled(findNextPreviousEnabled);
+ m_findPreviousAction->setEnabled(findNextPreviousEnabled);
+}
+
+void MainWindow::findPrevious()
+{
+ if (--m_findIndex < 0)
+ m_findIndex = m_findMatches.size() - 1;
+ if (m_findIndex >= 0)
+ selectAndGoTo(m_findMatches.at(m_findIndex));
+}
+
+void MainWindow::findNext()
+{
+ if (++m_findIndex >= m_findMatches.size())
+ m_findIndex = 0;
+ if (m_findIndex < m_findMatches.size())
+ selectAndGoTo(m_findMatches.at(m_findIndex));
+}
+
+void MainWindow::find()
+{
+ QInputDialog inputDialog(this);
+ inputDialog.setWindowTitle(tr("Find"));
+ inputDialog.setLabelText(tr("Text:"));
+ if (inputDialog.exec() != QDialog::Accepted)
+ return;
+ const QString value = inputDialog.textValue().trimmed();
+ if (value.isEmpty())
+ return;
+
+ m_findMatches.clear();
+ m_findIndex = 0;
+ foreach (const QStandardItem *item, m_model->findItems(value, Qt::MatchContains | Qt::MatchFixedString | Qt::MatchRecursive))
+ m_findMatches.append(m_model->indexFromItem(item));
+ statusBar()->showMessage(tr("%n mime types match \"%1\".", 0, m_findMatches.size()).arg(value));
+ updateFindActions();
+ if (!m_findMatches.isEmpty())
+ selectAndGoTo(m_findMatches.constFirst());
+}
diff --git a/examples/corelib/mimetypes/mimetypebrowser/mainwindow.h b/examples/corelib/mimetypes/mimetypebrowser/mainwindow.h
new file mode 100644
index 0000000000..11b1f004a0
--- /dev/null
+++ b/examples/corelib/mimetypes/mimetypebrowser/mainwindow.h
@@ -0,0 +1,79 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of The Qt Company Ltd nor the names of its
+** contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QMainWindow>
+#include <QModelIndexList>
+
+QT_FORWARD_DECLARE_CLASS(QAction)
+QT_FORWARD_DECLARE_CLASS(QTextEdit)
+QT_FORWARD_DECLARE_CLASS(QTreeView)
+
+class MimetypeModel;
+
+class MainWindow : public QMainWindow
+{
+ Q_OBJECT
+public:
+ explicit MainWindow(QWidget *parent = nullptr);
+
+private slots:
+ void currentChanged(const QModelIndex &);
+ void detectFile();
+ void find();
+ void findNext();
+ void findPrevious();
+
+private:
+ void selectAndGoTo(const QModelIndex &index);
+ void updateFindActions();
+
+ MimetypeModel *m_model;
+ QTreeView *m_treeView;
+ QTextEdit *m_detailsText;
+ QAction *m_findNextAction;
+ QAction *m_findPreviousAction;
+ QModelIndexList m_findMatches;
+ int m_findIndex;
+};
+
+#endif // MAINWINDOW_H
diff --git a/examples/corelib/mimetypes/mimetypebrowser/mimetypebrowser.pro b/examples/corelib/mimetypes/mimetypebrowser/mimetypebrowser.pro
new file mode 100644
index 0000000000..806e9cbd14
--- /dev/null
+++ b/examples/corelib/mimetypes/mimetypebrowser/mimetypebrowser.pro
@@ -0,0 +1,16 @@
+TEMPLATE = app
+QT += widgets
+CONFIG -= app_bundle
+CONFIG += c++11
+
+SOURCES += \
+ main.cpp \
+ mimetypemodel.cpp \
+ mainwindow.cpp
+
+HEADERS += \
+ mimetypemodel.h \
+ mainwindow.h
+
+target.path = $$[QT_INSTALL_EXAMPLES]/corelib/mimetypes/mimetypebrowser
+INSTALLS += target
diff --git a/examples/corelib/mimetypes/mimetypebrowser/mimetypemodel.cpp b/examples/corelib/mimetypes/mimetypebrowser/mimetypemodel.cpp
new file mode 100644
index 0000000000..46e603621a
--- /dev/null
+++ b/examples/corelib/mimetypes/mimetypebrowser/mimetypemodel.cpp
@@ -0,0 +1,202 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of The Qt Company Ltd nor the names of its
+** contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "mimetypemodel.h"
+
+#include <QIcon>
+
+#include <QDebug>
+#include <QMimeDatabase>
+#include <QTextStream>
+#include <QVariant>
+
+#include <algorithm>
+
+Q_DECLARE_METATYPE(QMimeType)
+
+typedef QList<QStandardItem *> StandardItemList;
+
+enum { mimeTypeRole = Qt::UserRole + 1, iconQueriedRole = Qt::UserRole + 2 };
+
+QT_BEGIN_NAMESPACE
+bool operator<(const QMimeType &t1, const QMimeType &t2)
+{
+ return t1.name() < t2.name();
+}
+QT_END_NAMESPACE
+
+static StandardItemList createRow(const QMimeType &t)
+{
+ const QVariant v = QVariant::fromValue(t);
+ QStandardItem *nameItem = new QStandardItem(t.name());
+ const Qt::ItemFlags flags = Qt::ItemIsSelectable | Qt::ItemIsEnabled;
+ nameItem->setData(v, mimeTypeRole);
+ nameItem->setData(QVariant(false), iconQueriedRole);
+ nameItem->setFlags(flags);
+ nameItem->setToolTip(t.comment());
+ return StandardItemList{nameItem};
+}
+
+MimetypeModel::MimetypeModel(QObject *parent)
+ : QStandardItemModel(0, ColumnCount, parent)
+{
+ setHorizontalHeaderLabels(QStringList{tr("Name")});
+ populate();
+}
+
+QVariant MimetypeModel::data(const QModelIndex &index, int role) const
+{
+ if (role != Qt::DecorationRole || !index.isValid() || index.data(iconQueriedRole).toBool())
+ return QStandardItemModel::data(index, role);
+ QStandardItem *item = itemFromIndex(index);
+ const QString iconName = item->data(mimeTypeRole).value<QMimeType>().iconName();
+ if (!iconName.isEmpty())
+ item->setIcon(QIcon::fromTheme(iconName));
+ item->setData(QVariant(true), iconQueriedRole);
+ return item->icon();
+}
+
+QMimeType MimetypeModel::mimeType(const QModelIndex &index) const
+{
+ return index.data(mimeTypeRole).value<QMimeType>();
+}
+
+void MimetypeModel::populate()
+{
+ typedef QList<QMimeType>::Iterator Iterator;
+
+ QMimeDatabase mimeDatabase;
+ QList<QMimeType> allTypes = mimeDatabase.allMimeTypes();
+
+ // Move top level types to rear end of list, sort this partition,
+ // create top level items and truncate the list.
+ Iterator end = allTypes.end();
+ const Iterator topLevelStart =
+ std::stable_partition(allTypes.begin(), end,
+ [](const QMimeType &t) { return !t.parentMimeTypes().isEmpty(); });
+ std::stable_sort(topLevelStart, end);
+ for (Iterator it = topLevelStart; it != end; ++it) {
+ const StandardItemList row = createRow(*it);
+ appendRow(row);
+ m_nameIndexHash.insert(it->name(), indexFromItem(row.constFirst()));
+ }
+ allTypes.erase(topLevelStart, end);
+
+ while (!allTypes.isEmpty()) {
+ // Find a type inheriting one that is already in the model.
+ end = allTypes.end();
+ auto nameIndexIt = m_nameIndexHash.constEnd();
+ for (Iterator it = allTypes.begin(); it != end; ++it) {
+ nameIndexIt = m_nameIndexHash.constFind(it->parentMimeTypes().constFirst());
+ if (nameIndexIt != m_nameIndexHash.constEnd())
+ break;
+ }
+ if (nameIndexIt == m_nameIndexHash.constEnd()) {
+ qWarning() << "Orphaned mime types:" << allTypes;
+ break;
+ }
+
+ // Move types inheriting the parent type to rear end of list, sort this partition,
+ // append the items to parent and truncate the list.
+ const QString &parentName = nameIndexIt.key();
+ const Iterator start =
+ std::stable_partition(allTypes.begin(), end, [parentName](const QMimeType &t)
+ { return !t.parentMimeTypes().contains(parentName); });
+ std::stable_sort(start, end);
+ QStandardItem *parentItem = itemFromIndex(nameIndexIt.value());
+ for (Iterator it = start; it != end; ++it) {
+ const StandardItemList row = createRow(*it);
+ parentItem->appendRow(row);
+ m_nameIndexHash.insert(it->name(), indexFromItem(row.constFirst()));
+ }
+ allTypes.erase(start, end);
+ }
+}
+
+QTextStream &operator<<(QTextStream &stream, const QStringList &list)
+{
+ for (int i = 0, size = list.size(); i < size; ++i) {
+ if (i)
+ stream << ", ";
+ stream << list.at(i);
+ }
+ return stream;
+}
+
+QString MimetypeModel::formatMimeTypeInfo(const QMimeType &t)
+{
+ QString result;
+ QTextStream str(&result);
+ str << "<html><head/><body><h3><center>" << t.name() << "</center></h3><br><table>";
+
+ const QStringList &aliases = t.aliases();
+ if (!aliases.isEmpty())
+ str << "<tr><td>Aliases:</td><td>" << " (" << aliases << ')';
+
+ str << "</td></tr>"
+ << "<tr><td>Comment:</td><td>" << t.comment() << "</td></tr>"
+ << "<tr><td>Icon name:</td><td>" << t.iconName() << "</td></tr>"
+ << "<tr><td>Generic icon name</td><td>" << t.genericIconName() << "</td></tr>";
+
+ const QString &filter = t.filterString();
+ if (!filter.isEmpty())
+ str << "<tr><td>Filter:</td><td>" << t.filterString() << "</td></tr>";
+
+ const QStringList &patterns = t.globPatterns();
+ if (!patterns.isEmpty())
+ str << "<tr><td>Glob patterns:</td><td>" << patterns << "</td></tr>";
+
+ const QStringList &parentMimeTypes = t.parentMimeTypes();
+ if (!parentMimeTypes.isEmpty())
+ str << "<tr><td>Parent types:</td><td>" << t.parentMimeTypes() << "</td></tr>";
+
+ QStringList suffixes = t.suffixes();
+ if (!suffixes.isEmpty()) {
+ str << "<tr><td>Suffixes:</td><td>";
+ const QString &preferredSuffix = t.preferredSuffix();
+ if (!preferredSuffix.isEmpty()) {
+ suffixes.removeOne(preferredSuffix);
+ str << "<b>" << preferredSuffix << "</b> ";
+ }
+ str << suffixes << "</td></tr>";
+ }
+ str << "</table></body></html>";
+ return result;
+}
diff --git a/examples/corelib/mimetypes/mimetypebrowser/mimetypemodel.h b/examples/corelib/mimetypes/mimetypebrowser/mimetypemodel.h
new file mode 100644
index 0000000000..0656e64e8f
--- /dev/null
+++ b/examples/corelib/mimetypes/mimetypebrowser/mimetypemodel.h
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of The Qt Company Ltd nor the names of its
+** contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MIMETYPEMODEL_H
+#define MIMETYPEMODEL_H
+
+#include <QStandardItemModel>
+#include <QHash>
+
+QT_FORWARD_DECLARE_CLASS(QMimeType)
+
+class MimetypeModel : public QStandardItemModel
+{
+ Q_OBJECT
+public:
+ enum Columns { NameColumn, ColumnCount };
+
+ explicit MimetypeModel(QObject *parent = nullptr);
+
+ QVariant data(const QModelIndex &index, int role) const override;
+
+ QMimeType mimeType(const QModelIndex &) const;
+
+ QModelIndex indexForMimeType(const QString &name) const
+ { return m_nameIndexHash.value(name); }
+
+ static QString formatMimeTypeInfo(const QMimeType &);
+
+private:
+ typedef QHash<QString, QModelIndex> NameIndexHash;
+
+ void populate();
+
+ NameIndexHash m_nameIndexHash;
+};
+
+#endif // MIMETYPEMODEL_H
diff --git a/examples/corelib/mimetypes/mimetypes.pro b/examples/corelib/mimetypes/mimetypes.pro
new file mode 100644
index 0000000000..6c7e0eab13
--- /dev/null
+++ b/examples/corelib/mimetypes/mimetypes.pro
@@ -0,0 +1,4 @@
+TEMPLATE = subdirs
+
+qtHaveModule(widgets): SUBDIRS += \
+ mimetypebrowser
diff --git a/examples/corelib/threads/doc/src/mandelbrot.qdoc b/examples/corelib/threads/doc/src/mandelbrot.qdoc
index 27f771ee6a..dd0e4e5ef2 100644
--- a/examples/corelib/threads/doc/src/mandelbrot.qdoc
+++ b/examples/corelib/threads/doc/src/mandelbrot.qdoc
@@ -1,7 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
**
@@ -11,8 +11,8 @@
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
** Foundation and appearing in the file included in the packaging of
** this file. Please review the following information to ensure
** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/examples/corelib/threads/doc/src/queuedcustomtype.qdoc b/examples/corelib/threads/doc/src/queuedcustomtype.qdoc
index ec9ef6477e..015007cae1 100644
--- a/examples/corelib/threads/doc/src/queuedcustomtype.qdoc
+++ b/examples/corelib/threads/doc/src/queuedcustomtype.qdoc
@@ -1,7 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
**
@@ -11,8 +11,8 @@
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
** Foundation and appearing in the file included in the packaging of
** this file. Please review the following information to ensure
** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/examples/corelib/threads/doc/src/semaphores.qdoc b/examples/corelib/threads/doc/src/semaphores.qdoc
index abc961811a..b1a1fc1ed2 100644
--- a/examples/corelib/threads/doc/src/semaphores.qdoc
+++ b/examples/corelib/threads/doc/src/semaphores.qdoc
@@ -1,7 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
**
@@ -11,8 +11,8 @@
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
** Foundation and appearing in the file included in the packaging of
** this file. Please review the following information to ensure
** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/examples/corelib/threads/doc/src/waitconditions.qdoc b/examples/corelib/threads/doc/src/waitconditions.qdoc
index a2b49fdbc7..5a6831ede4 100644
--- a/examples/corelib/threads/doc/src/waitconditions.qdoc
+++ b/examples/corelib/threads/doc/src/waitconditions.qdoc
@@ -1,7 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
**
@@ -11,8 +11,8 @@
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
** Foundation and appearing in the file included in the packaging of
** this file. Please review the following information to ensure
** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/examples/corelib/threads/mandelbrot/main.cpp b/examples/corelib/threads/mandelbrot/main.cpp
index e9157197f9..9832d55514 100644
--- a/examples/corelib/threads/mandelbrot/main.cpp
+++ b/examples/corelib/threads/mandelbrot/main.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/corelib/threads/mandelbrot/mandelbrotwidget.cpp b/examples/corelib/threads/mandelbrot/mandelbrotwidget.cpp
index dc84a74a50..8b11c20972 100644
--- a/examples/corelib/threads/mandelbrot/mandelbrotwidget.cpp
+++ b/examples/corelib/threads/mandelbrot/mandelbrotwidget.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/corelib/threads/mandelbrot/mandelbrotwidget.h b/examples/corelib/threads/mandelbrot/mandelbrotwidget.h
index 170446df5f..14946b44fb 100644
--- a/examples/corelib/threads/mandelbrot/mandelbrotwidget.h
+++ b/examples/corelib/threads/mandelbrot/mandelbrotwidget.h
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/corelib/threads/mandelbrot/renderthread.cpp b/examples/corelib/threads/mandelbrot/renderthread.cpp
index d52a5f2320..c57b696e25 100644
--- a/examples/corelib/threads/mandelbrot/renderthread.cpp
+++ b/examples/corelib/threads/mandelbrot/renderthread.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/corelib/threads/mandelbrot/renderthread.h b/examples/corelib/threads/mandelbrot/renderthread.h
index 41d83c6323..b9b59ba4cf 100644
--- a/examples/corelib/threads/mandelbrot/renderthread.h
+++ b/examples/corelib/threads/mandelbrot/renderthread.h
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/corelib/threads/queuedcustomtype/block.cpp b/examples/corelib/threads/queuedcustomtype/block.cpp
index 90a3602046..a5058cc5ae 100644
--- a/examples/corelib/threads/queuedcustomtype/block.cpp
+++ b/examples/corelib/threads/queuedcustomtype/block.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/corelib/threads/queuedcustomtype/block.h b/examples/corelib/threads/queuedcustomtype/block.h
index a345dd17e2..547cc10f0a 100644
--- a/examples/corelib/threads/queuedcustomtype/block.h
+++ b/examples/corelib/threads/queuedcustomtype/block.h
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/corelib/threads/queuedcustomtype/main.cpp b/examples/corelib/threads/queuedcustomtype/main.cpp
index f3a20bde58..7084b7538a 100644
--- a/examples/corelib/threads/queuedcustomtype/main.cpp
+++ b/examples/corelib/threads/queuedcustomtype/main.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/corelib/threads/queuedcustomtype/renderthread.cpp b/examples/corelib/threads/queuedcustomtype/renderthread.cpp
index c063f30885..f894dd587f 100644
--- a/examples/corelib/threads/queuedcustomtype/renderthread.cpp
+++ b/examples/corelib/threads/queuedcustomtype/renderthread.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/corelib/threads/queuedcustomtype/renderthread.h b/examples/corelib/threads/queuedcustomtype/renderthread.h
index a70059ec29..318ef293b4 100644
--- a/examples/corelib/threads/queuedcustomtype/renderthread.h
+++ b/examples/corelib/threads/queuedcustomtype/renderthread.h
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/corelib/threads/queuedcustomtype/window.cpp b/examples/corelib/threads/queuedcustomtype/window.cpp
index 08c3f32279..7b9004d868 100644
--- a/examples/corelib/threads/queuedcustomtype/window.cpp
+++ b/examples/corelib/threads/queuedcustomtype/window.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/corelib/threads/queuedcustomtype/window.h b/examples/corelib/threads/queuedcustomtype/window.h
index 52c67428dd..c472c0fea7 100644
--- a/examples/corelib/threads/queuedcustomtype/window.h
+++ b/examples/corelib/threads/queuedcustomtype/window.h
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/corelib/threads/semaphores/semaphores.cpp b/examples/corelib/threads/semaphores/semaphores.cpp
index 4582b91623..f44f709d72 100644
--- a/examples/corelib/threads/semaphores/semaphores.cpp
+++ b/examples/corelib/threads/semaphores/semaphores.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/corelib/threads/waitconditions/waitconditions.cpp b/examples/corelib/threads/waitconditions/waitconditions.cpp
index 56d066ca93..7040246937 100644
--- a/examples/corelib/threads/waitconditions/waitconditions.cpp
+++ b/examples/corelib/threads/waitconditions/waitconditions.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/corelib/tools/contiguouscache/main.cpp b/examples/corelib/tools/contiguouscache/main.cpp
index 97b6fb969c..4f31e21147 100644
--- a/examples/corelib/tools/contiguouscache/main.cpp
+++ b/examples/corelib/tools/contiguouscache/main.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/corelib/tools/contiguouscache/randomlistmodel.cpp b/examples/corelib/tools/contiguouscache/randomlistmodel.cpp
index edcf66ac05..f3d8f4b133 100644
--- a/examples/corelib/tools/contiguouscache/randomlistmodel.cpp
+++ b/examples/corelib/tools/contiguouscache/randomlistmodel.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/corelib/tools/contiguouscache/randomlistmodel.h b/examples/corelib/tools/contiguouscache/randomlistmodel.h
index 9569ed8abf..f1f9bd247e 100644
--- a/examples/corelib/tools/contiguouscache/randomlistmodel.h
+++ b/examples/corelib/tools/contiguouscache/randomlistmodel.h
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/corelib/tools/customtype/main.cpp b/examples/corelib/tools/customtype/main.cpp
index 0f70fda764..ced317e208 100644
--- a/examples/corelib/tools/customtype/main.cpp
+++ b/examples/corelib/tools/customtype/main.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/corelib/tools/customtype/message.cpp b/examples/corelib/tools/customtype/message.cpp
index 9487e4ce67..8b2c295e46 100644
--- a/examples/corelib/tools/customtype/message.cpp
+++ b/examples/corelib/tools/customtype/message.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/corelib/tools/customtype/message.h b/examples/corelib/tools/customtype/message.h
index a888208204..9871a7d52d 100644
--- a/examples/corelib/tools/customtype/message.h
+++ b/examples/corelib/tools/customtype/message.h
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/corelib/tools/customtypesending/main.cpp b/examples/corelib/tools/customtypesending/main.cpp
index 5e5807defe..966c284d9a 100644
--- a/examples/corelib/tools/customtypesending/main.cpp
+++ b/examples/corelib/tools/customtypesending/main.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/corelib/tools/customtypesending/message.cpp b/examples/corelib/tools/customtypesending/message.cpp
index 4adbbee16f..c990768079 100644
--- a/examples/corelib/tools/customtypesending/message.cpp
+++ b/examples/corelib/tools/customtypesending/message.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/corelib/tools/customtypesending/message.h b/examples/corelib/tools/customtypesending/message.h
index 3feaeef522..a8d6d6be05 100644
--- a/examples/corelib/tools/customtypesending/message.h
+++ b/examples/corelib/tools/customtypesending/message.h
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/corelib/tools/customtypesending/window.cpp b/examples/corelib/tools/customtypesending/window.cpp
index 61d2141730..224656f94c 100644
--- a/examples/corelib/tools/customtypesending/window.cpp
+++ b/examples/corelib/tools/customtypesending/window.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/corelib/tools/customtypesending/window.h b/examples/corelib/tools/customtypesending/window.h
index 48cb3bfd92..d050931b74 100644
--- a/examples/corelib/tools/customtypesending/window.h
+++ b/examples/corelib/tools/customtypesending/window.h
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/corelib/tools/doc/src/contiguouscache.qdoc b/examples/corelib/tools/doc/src/contiguouscache.qdoc
index 19bc46080d..c2c686b237 100644
--- a/examples/corelib/tools/doc/src/contiguouscache.qdoc
+++ b/examples/corelib/tools/doc/src/contiguouscache.qdoc
@@ -1,7 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
**
@@ -11,8 +11,8 @@
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
** Foundation and appearing in the file included in the packaging of
** this file. Please review the following information to ensure
** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/examples/corelib/tools/doc/src/customtype.qdoc b/examples/corelib/tools/doc/src/customtype.qdoc
index 5efad6636c..91b814808a 100644
--- a/examples/corelib/tools/doc/src/customtype.qdoc
+++ b/examples/corelib/tools/doc/src/customtype.qdoc
@@ -1,7 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
**
@@ -11,8 +11,8 @@
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
** Foundation and appearing in the file included in the packaging of
** this file. Please review the following information to ensure
** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/examples/dbus/chat/chat.cpp b/examples/dbus/chat/chat.cpp
index 952ee55042..7855457a82 100644
--- a/examples/dbus/chat/chat.cpp
+++ b/examples/dbus/chat/chat.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/dbus/chat/chat.h b/examples/dbus/chat/chat.h
index 49ff84e103..7faebe63fd 100644
--- a/examples/dbus/chat/chat.h
+++ b/examples/dbus/chat/chat.h
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/dbus/complexpingpong/complexping.cpp b/examples/dbus/complexpingpong/complexping.cpp
index 855ef5d394..cf2535930d 100644
--- a/examples/dbus/complexpingpong/complexping.cpp
+++ b/examples/dbus/complexpingpong/complexping.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/dbus/complexpingpong/complexping.h b/examples/dbus/complexpingpong/complexping.h
index f6f1505507..98a4332f38 100644
--- a/examples/dbus/complexpingpong/complexping.h
+++ b/examples/dbus/complexpingpong/complexping.h
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/dbus/complexpingpong/complexpong.cpp b/examples/dbus/complexpingpong/complexpong.cpp
index 682e301f12..c9cc78b376 100644
--- a/examples/dbus/complexpingpong/complexpong.cpp
+++ b/examples/dbus/complexpingpong/complexpong.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/dbus/complexpingpong/complexpong.h b/examples/dbus/complexpingpong/complexpong.h
index c3c949b532..c116d447c6 100644
--- a/examples/dbus/complexpingpong/complexpong.h
+++ b/examples/dbus/complexpingpong/complexpong.h
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/dbus/complexpingpong/ping-common.h b/examples/dbus/complexpingpong/ping-common.h
index 9e6d52ab66..f35a33f513 100644
--- a/examples/dbus/complexpingpong/ping-common.h
+++ b/examples/dbus/complexpingpong/ping-common.h
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/dbus/doc/src/chat.qdoc b/examples/dbus/doc/src/chat.qdoc
index 32c3838a1f..f643af10d3 100644
--- a/examples/dbus/doc/src/chat.qdoc
+++ b/examples/dbus/doc/src/chat.qdoc
@@ -1,7 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
**
@@ -11,8 +11,8 @@
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
** Foundation and appearing in the file included in the packaging of
** this file. Please review the following information to ensure
** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/examples/dbus/doc/src/complexpingpong.qdoc b/examples/dbus/doc/src/complexpingpong.qdoc
index cd0015492e..fca654a06a 100644
--- a/examples/dbus/doc/src/complexpingpong.qdoc
+++ b/examples/dbus/doc/src/complexpingpong.qdoc
@@ -1,7 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
**
@@ -11,8 +11,8 @@
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
** Foundation and appearing in the file included in the packaging of
** this file. Please review the following information to ensure
** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/examples/dbus/doc/src/listnames.qdoc b/examples/dbus/doc/src/listnames.qdoc
index c414715174..40be61b527 100644
--- a/examples/dbus/doc/src/listnames.qdoc
+++ b/examples/dbus/doc/src/listnames.qdoc
@@ -1,7 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
**
@@ -11,8 +11,8 @@
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
** Foundation and appearing in the file included in the packaging of
** this file. Please review the following information to ensure
** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/examples/dbus/doc/src/pingpong.qdoc b/examples/dbus/doc/src/pingpong.qdoc
index d6b0d4b716..28ef737d38 100644
--- a/examples/dbus/doc/src/pingpong.qdoc
+++ b/examples/dbus/doc/src/pingpong.qdoc
@@ -1,7 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
**
@@ -11,8 +11,8 @@
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
** Foundation and appearing in the file included in the packaging of
** this file. Please review the following information to ensure
** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/examples/dbus/listnames/listnames.cpp b/examples/dbus/listnames/listnames.cpp
index 8559372144..c0afec062d 100644
--- a/examples/dbus/listnames/listnames.cpp
+++ b/examples/dbus/listnames/listnames.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/dbus/pingpong/ping-common.h b/examples/dbus/pingpong/ping-common.h
index 9e6d52ab66..f35a33f513 100644
--- a/examples/dbus/pingpong/ping-common.h
+++ b/examples/dbus/pingpong/ping-common.h
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/dbus/pingpong/ping.cpp b/examples/dbus/pingpong/ping.cpp
index 7cae6d17f4..e013a82eb2 100644
--- a/examples/dbus/pingpong/ping.cpp
+++ b/examples/dbus/pingpong/ping.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/dbus/pingpong/pong.cpp b/examples/dbus/pingpong/pong.cpp
index 0a94a6fc2e..e1e362f218 100644
--- a/examples/dbus/pingpong/pong.cpp
+++ b/examples/dbus/pingpong/pong.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/dbus/pingpong/pong.h b/examples/dbus/pingpong/pong.h
index e1052d0698..0b22f37eb7 100644
--- a/examples/dbus/pingpong/pong.h
+++ b/examples/dbus/pingpong/pong.h
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/dbus/remotecontrolledcar/car/car.cpp b/examples/dbus/remotecontrolledcar/car/car.cpp
index 8f77162340..67daac79ba 100644
--- a/examples/dbus/remotecontrolledcar/car/car.cpp
+++ b/examples/dbus/remotecontrolledcar/car/car.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/dbus/remotecontrolledcar/car/car.h b/examples/dbus/remotecontrolledcar/car/car.h
index d7aff9cb5f..92fc1ccdcb 100644
--- a/examples/dbus/remotecontrolledcar/car/car.h
+++ b/examples/dbus/remotecontrolledcar/car/car.h
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/dbus/remotecontrolledcar/car/main.cpp b/examples/dbus/remotecontrolledcar/car/main.cpp
index 9db5d1d68b..463add47cf 100644
--- a/examples/dbus/remotecontrolledcar/car/main.cpp
+++ b/examples/dbus/remotecontrolledcar/car/main.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/dbus/remotecontrolledcar/controller/controller.cpp b/examples/dbus/remotecontrolledcar/controller/controller.cpp
index 5f7dd0c383..cb2e7591d8 100644
--- a/examples/dbus/remotecontrolledcar/controller/controller.cpp
+++ b/examples/dbus/remotecontrolledcar/controller/controller.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/dbus/remotecontrolledcar/controller/controller.h b/examples/dbus/remotecontrolledcar/controller/controller.h
index f13bbad661..74776f2638 100644
--- a/examples/dbus/remotecontrolledcar/controller/controller.h
+++ b/examples/dbus/remotecontrolledcar/controller/controller.h
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/dbus/remotecontrolledcar/controller/main.cpp b/examples/dbus/remotecontrolledcar/controller/main.cpp
index 26c92c6930..88edd13c1b 100644
--- a/examples/dbus/remotecontrolledcar/controller/main.cpp
+++ b/examples/dbus/remotecontrolledcar/controller/main.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/dbus/remotecontrolledcar/doc/src/dbus-remotecontrolledcar.qdoc b/examples/dbus/remotecontrolledcar/doc/src/dbus-remotecontrolledcar.qdoc
index bf457bebe3..e18f963103 100644
--- a/examples/dbus/remotecontrolledcar/doc/src/dbus-remotecontrolledcar.qdoc
+++ b/examples/dbus/remotecontrolledcar/doc/src/dbus-remotecontrolledcar.qdoc
@@ -1,7 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
**
@@ -11,8 +11,8 @@
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
** Foundation and appearing in the file included in the packaging of
** this file. Please review the following information to ensure
** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/examples/embedded/digiflip/digiflip.cpp b/examples/embedded/digiflip/digiflip.cpp
index af4289efb3..c5438eb367 100644
--- a/examples/embedded/digiflip/digiflip.cpp
+++ b/examples/embedded/digiflip/digiflip.cpp
@@ -1,31 +1,48 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the demonstration applications of the Qt Toolkit.
**
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:BSD$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of The Qt Company Ltd nor the names of its
+** contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
**
** $QT_END_LICENSE$
**
diff --git a/examples/embedded/flickable/flickable.cpp b/examples/embedded/flickable/flickable.cpp
index fb8b6cfadf..fff4bac0e6 100644
--- a/examples/embedded/flickable/flickable.cpp
+++ b/examples/embedded/flickable/flickable.cpp
@@ -1,31 +1,48 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the demonstration applications of the Qt Toolkit.
**
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:BSD$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of The Qt Company Ltd nor the names of its
+** contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
**
** $QT_END_LICENSE$
**
diff --git a/examples/embedded/flickable/flickable.h b/examples/embedded/flickable/flickable.h
index 3d1b2f95d0..80c80f9ccf 100644
--- a/examples/embedded/flickable/flickable.h
+++ b/examples/embedded/flickable/flickable.h
@@ -1,31 +1,48 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the demonstration applications of the Qt Toolkit.
**
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:BSD$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of The Qt Company Ltd nor the names of its
+** contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
**
** $QT_END_LICENSE$
**
diff --git a/examples/embedded/flickable/main.cpp b/examples/embedded/flickable/main.cpp
index 15b282aaa5..9772ba4f55 100644
--- a/examples/embedded/flickable/main.cpp
+++ b/examples/embedded/flickable/main.cpp
@@ -1,31 +1,48 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the demonstration applications of the Qt Toolkit.
**
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:BSD$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of The Qt Company Ltd nor the names of its
+** contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
**
** $QT_END_LICENSE$
**
diff --git a/examples/embedded/flightinfo/flightinfo.cpp b/examples/embedded/flightinfo/flightinfo.cpp
index 5e81c748f6..8ad1e5c0c0 100644
--- a/examples/embedded/flightinfo/flightinfo.cpp
+++ b/examples/embedded/flightinfo/flightinfo.cpp
@@ -1,31 +1,48 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the demonstration applications of the Qt Toolkit.
**
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:BSD$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of The Qt Company Ltd nor the names of its
+** contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
**
** $QT_END_LICENSE$
**
diff --git a/examples/embedded/lightmaps/lightmaps.cpp b/examples/embedded/lightmaps/lightmaps.cpp
index 95240183c9..a8bc13beaf 100644
--- a/examples/embedded/lightmaps/lightmaps.cpp
+++ b/examples/embedded/lightmaps/lightmaps.cpp
@@ -1,31 +1,48 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the demonstration applications of the Qt Toolkit.
**
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:BSD$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of The Qt Company Ltd nor the names of its
+** contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
**
** $QT_END_LICENSE$
**
diff --git a/examples/embedded/lightmaps/lightmaps.h b/examples/embedded/lightmaps/lightmaps.h
index 40ecec0670..a171065b2f 100644
--- a/examples/embedded/lightmaps/lightmaps.h
+++ b/examples/embedded/lightmaps/lightmaps.h
@@ -1,31 +1,48 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the demonstration applications of the Qt Toolkit.
**
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:BSD$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of The Qt Company Ltd nor the names of its
+** contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
**
** $QT_END_LICENSE$
**
diff --git a/examples/embedded/lightmaps/main.cpp b/examples/embedded/lightmaps/main.cpp
index cbb66ec758..663e6a5b5d 100644
--- a/examples/embedded/lightmaps/main.cpp
+++ b/examples/embedded/lightmaps/main.cpp
@@ -1,31 +1,48 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the demonstration applications of the Qt Toolkit.
**
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:BSD$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of The Qt Company Ltd nor the names of its
+** contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
**
** $QT_END_LICENSE$
**
diff --git a/examples/embedded/lightmaps/mapzoom.cpp b/examples/embedded/lightmaps/mapzoom.cpp
index e52d6afc95..d82b9ad473 100644
--- a/examples/embedded/lightmaps/mapzoom.cpp
+++ b/examples/embedded/lightmaps/mapzoom.cpp
@@ -1,31 +1,48 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the demonstration applications of the Qt Toolkit.
**
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:BSD$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of The Qt Company Ltd nor the names of its
+** contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
**
** $QT_END_LICENSE$
**
diff --git a/examples/embedded/lightmaps/mapzoom.h b/examples/embedded/lightmaps/mapzoom.h
index cd8757a164..30f2e63138 100644
--- a/examples/embedded/lightmaps/mapzoom.h
+++ b/examples/embedded/lightmaps/mapzoom.h
@@ -1,31 +1,48 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the demonstration applications of the Qt Toolkit.
**
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:BSD$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of The Qt Company Ltd nor the names of its
+** contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
**
** $QT_END_LICENSE$
**
diff --git a/examples/embedded/lightmaps/slippymap.cpp b/examples/embedded/lightmaps/slippymap.cpp
index 8f41124bdf..7e847c2501 100644
--- a/examples/embedded/lightmaps/slippymap.cpp
+++ b/examples/embedded/lightmaps/slippymap.cpp
@@ -1,31 +1,48 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the demonstration applications of the Qt Toolkit.
**
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:BSD$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of The Qt Company Ltd nor the names of its
+** contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
**
** $QT_END_LICENSE$
**
diff --git a/examples/embedded/lightmaps/slippymap.h b/examples/embedded/lightmaps/slippymap.h
index 66d2985b9e..db95ceb684 100644
--- a/examples/embedded/lightmaps/slippymap.h
+++ b/examples/embedded/lightmaps/slippymap.h
@@ -1,31 +1,48 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the demonstration applications of the Qt Toolkit.
**
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:BSD$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of The Qt Company Ltd nor the names of its
+** contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
**
** $QT_END_LICENSE$
**
diff --git a/examples/embedded/raycasting/raycasting.cpp b/examples/embedded/raycasting/raycasting.cpp
index 466f10d7fa..992c383db1 100644
--- a/examples/embedded/raycasting/raycasting.cpp
+++ b/examples/embedded/raycasting/raycasting.cpp
@@ -1,31 +1,48 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the demonstration applications of the Qt Toolkit.
**
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:BSD$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of The Qt Company Ltd nor the names of its
+** contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
**
** $QT_END_LICENSE$
**
diff --git a/examples/embedded/styleexample/main.cpp b/examples/embedded/styleexample/main.cpp
index f1ee7007c0..58c5de4db2 100644
--- a/examples/embedded/styleexample/main.cpp
+++ b/examples/embedded/styleexample/main.cpp
@@ -1,31 +1,48 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the demonstration applications of the Qt Toolkit.
**
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:BSD$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of The Qt Company Ltd nor the names of its
+** contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
**
** $QT_END_LICENSE$
**
diff --git a/examples/embedded/styleexample/stylewidget.cpp b/examples/embedded/styleexample/stylewidget.cpp
index c0926a6826..322d0daf8c 100644
--- a/examples/embedded/styleexample/stylewidget.cpp
+++ b/examples/embedded/styleexample/stylewidget.cpp
@@ -1,31 +1,48 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the demonstration applications of the Qt Toolkit.
**
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:BSD$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of The Qt Company Ltd nor the names of its
+** contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
**
** $QT_END_LICENSE$
**
diff --git a/examples/embedded/styleexample/stylewidget.h b/examples/embedded/styleexample/stylewidget.h
index 5427b63894..6b109bbbce 100644
--- a/examples/embedded/styleexample/stylewidget.h
+++ b/examples/embedded/styleexample/stylewidget.h
@@ -1,31 +1,48 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the demonstration applications of the Qt Toolkit.
**
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:BSD$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of The Qt Company Ltd nor the names of its
+** contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
**
** $QT_END_LICENSE$
**
diff --git a/examples/gui/analogclock/main.cpp b/examples/gui/analogclock/main.cpp
index d9c7d7edf9..29b21410e3 100644
--- a/examples/gui/analogclock/main.cpp
+++ b/examples/gui/analogclock/main.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/gui/doc/src/analogclockwindow.qdoc b/examples/gui/doc/src/analogclockwindow.qdoc
index 91242169ab..f13f7261aa 100644
--- a/examples/gui/doc/src/analogclockwindow.qdoc
+++ b/examples/gui/doc/src/analogclockwindow.qdoc
@@ -1,7 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
**
@@ -11,8 +11,8 @@
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
** Foundation and appearing in the file included in the packaging of
** this file. Please review the following information to ensure
** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/examples/gui/doc/src/openglwindow.qdoc b/examples/gui/doc/src/openglwindow.qdoc
index 3ea85b4267..e93451c9a5 100644
--- a/examples/gui/doc/src/openglwindow.qdoc
+++ b/examples/gui/doc/src/openglwindow.qdoc
@@ -1,7 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
**
@@ -11,8 +11,8 @@
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
** Foundation and appearing in the file included in the packaging of
** this file. Please review the following information to ensure
** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/examples/gui/doc/src/rasterwindow.qdoc b/examples/gui/doc/src/rasterwindow.qdoc
index 22bd8cfae7..963d09971d 100644
--- a/examples/gui/doc/src/rasterwindow.qdoc
+++ b/examples/gui/doc/src/rasterwindow.qdoc
@@ -1,7 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
**
@@ -11,8 +11,8 @@
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
** Foundation and appearing in the file included in the packaging of
** this file. Please review the following information to ensure
** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/examples/gui/openglwindow/main.cpp b/examples/gui/openglwindow/main.cpp
index d79ecd6510..ba56ba39f5 100644
--- a/examples/gui/openglwindow/main.cpp
+++ b/examples/gui/openglwindow/main.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/gui/openglwindow/openglwindow.cpp b/examples/gui/openglwindow/openglwindow.cpp
index 5cd3fde6f1..d36614f6a0 100644
--- a/examples/gui/openglwindow/openglwindow.cpp
+++ b/examples/gui/openglwindow/openglwindow.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/gui/openglwindow/openglwindow.h b/examples/gui/openglwindow/openglwindow.h
index 9b5d1fc6ec..820eaf1b8f 100644
--- a/examples/gui/openglwindow/openglwindow.h
+++ b/examples/gui/openglwindow/openglwindow.h
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/gui/rasterwindow/main.cpp b/examples/gui/rasterwindow/main.cpp
index f7ba34e953..bd5c0df1fc 100644
--- a/examples/gui/rasterwindow/main.cpp
+++ b/examples/gui/rasterwindow/main.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/gui/rasterwindow/rasterwindow.cpp b/examples/gui/rasterwindow/rasterwindow.cpp
index f343ab6c30..eb34bec252 100644
--- a/examples/gui/rasterwindow/rasterwindow.cpp
+++ b/examples/gui/rasterwindow/rasterwindow.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/gui/rasterwindow/rasterwindow.h b/examples/gui/rasterwindow/rasterwindow.h
index 03f7c10281..f03975a808 100644
--- a/examples/gui/rasterwindow/rasterwindow.h
+++ b/examples/gui/rasterwindow/rasterwindow.h
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/network/bearermonitor/bearermonitor.cpp b/examples/network/bearermonitor/bearermonitor.cpp
index 77fcabbd25..f9b899b06b 100644
--- a/examples/network/bearermonitor/bearermonitor.cpp
+++ b/examples/network/bearermonitor/bearermonitor.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/network/bearermonitor/bearermonitor.h b/examples/network/bearermonitor/bearermonitor.h
index b4f9e4c192..7de186cd14 100644
--- a/examples/network/bearermonitor/bearermonitor.h
+++ b/examples/network/bearermonitor/bearermonitor.h
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/network/bearermonitor/main.cpp b/examples/network/bearermonitor/main.cpp
index 2cd5b2eb50..363889dee4 100644
--- a/examples/network/bearermonitor/main.cpp
+++ b/examples/network/bearermonitor/main.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/network/bearermonitor/sessionwidget.cpp b/examples/network/bearermonitor/sessionwidget.cpp
index fb731b52d1..237ceee2bd 100644
--- a/examples/network/bearermonitor/sessionwidget.cpp
+++ b/examples/network/bearermonitor/sessionwidget.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/network/bearermonitor/sessionwidget.h b/examples/network/bearermonitor/sessionwidget.h
index ad32caafb2..6bc0aef7c1 100644
--- a/examples/network/bearermonitor/sessionwidget.h
+++ b/examples/network/bearermonitor/sessionwidget.h
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/network/blockingfortuneclient/blockingclient.cpp b/examples/network/blockingfortuneclient/blockingclient.cpp
index 4a54cab644..607215cf13 100644
--- a/examples/network/blockingfortuneclient/blockingclient.cpp
+++ b/examples/network/blockingfortuneclient/blockingclient.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/network/blockingfortuneclient/blockingclient.h b/examples/network/blockingfortuneclient/blockingclient.h
index 261e34e035..2a2dd81b71 100644
--- a/examples/network/blockingfortuneclient/blockingclient.h
+++ b/examples/network/blockingfortuneclient/blockingclient.h
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/network/blockingfortuneclient/fortunethread.cpp b/examples/network/blockingfortuneclient/fortunethread.cpp
index b948d504ae..67ac7ebfa5 100644
--- a/examples/network/blockingfortuneclient/fortunethread.cpp
+++ b/examples/network/blockingfortuneclient/fortunethread.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
@@ -96,37 +106,27 @@ void FortuneThread::run()
emit error(socket.error(), socket.errorString());
return;
}
-//! [8] //! [9]
-
- while (socket.bytesAvailable() < (int)sizeof(quint16)) {
- if (!socket.waitForReadyRead(Timeout)) {
- emit error(socket.error(), socket.errorString());
- return;
- }
-//! [9] //! [10]
- }
-//! [10] //! [11]
+//! [8] //! [11]
- quint16 blockSize;
QDataStream in(&socket);
in.setVersion(QDataStream::Qt_4_0);
- in >> blockSize;
+ QString fortune;
//! [11] //! [12]
- while (socket.bytesAvailable() < blockSize) {
+ do {
if (!socket.waitForReadyRead(Timeout)) {
emit error(socket.error(), socket.errorString());
return;
}
-//! [12] //! [13]
- }
-//! [13] //! [14]
+
+ in.startTransaction();
+ in >> fortune;
+ } while (!in.commitTransaction());
+//! [12] //! [15]
mutex.lock();
- QString fortune;
- in >> fortune;
emit newFortune(fortune);
-//! [7] //! [14] //! [15]
+//! [7]
cond.wait(&mutex);
serverName = hostName;
diff --git a/examples/network/blockingfortuneclient/fortunethread.h b/examples/network/blockingfortuneclient/fortunethread.h
index fcd876a761..2ab1adb921 100644
--- a/examples/network/blockingfortuneclient/fortunethread.h
+++ b/examples/network/blockingfortuneclient/fortunethread.h
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/network/blockingfortuneclient/main.cpp b/examples/network/blockingfortuneclient/main.cpp
index c3dd9daffc..128760c3b2 100644
--- a/examples/network/blockingfortuneclient/main.cpp
+++ b/examples/network/blockingfortuneclient/main.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/network/broadcastreceiver/main.cpp b/examples/network/broadcastreceiver/main.cpp
index 6082e81ad1..ba1beeee12 100644
--- a/examples/network/broadcastreceiver/main.cpp
+++ b/examples/network/broadcastreceiver/main.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/network/broadcastreceiver/receiver.cpp b/examples/network/broadcastreceiver/receiver.cpp
index 6263010150..4225a19746 100644
--- a/examples/network/broadcastreceiver/receiver.cpp
+++ b/examples/network/broadcastreceiver/receiver.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/network/broadcastreceiver/receiver.h b/examples/network/broadcastreceiver/receiver.h
index aeca92e59d..71b91246fc 100644
--- a/examples/network/broadcastreceiver/receiver.h
+++ b/examples/network/broadcastreceiver/receiver.h
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/network/broadcastsender/main.cpp b/examples/network/broadcastsender/main.cpp
index faefb074cf..b1ccc78cea 100644
--- a/examples/network/broadcastsender/main.cpp
+++ b/examples/network/broadcastsender/main.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/network/broadcastsender/sender.cpp b/examples/network/broadcastsender/sender.cpp
index 9497388d65..344f898683 100644
--- a/examples/network/broadcastsender/sender.cpp
+++ b/examples/network/broadcastsender/sender.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/network/broadcastsender/sender.h b/examples/network/broadcastsender/sender.h
index 1996b9a86a..e9c1076dd3 100644
--- a/examples/network/broadcastsender/sender.h
+++ b/examples/network/broadcastsender/sender.h
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/network/dnslookup/dnslookup.cpp b/examples/network/dnslookup/dnslookup.cpp
index e8d00f86a0..63819b170c 100644
--- a/examples/network/dnslookup/dnslookup.cpp
+++ b/examples/network/dnslookup/dnslookup.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2012 Jeremy Lainé <jeremy.laine@m4x.org>
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 Jeremy Lainé <jeremy.laine@m4x.org>
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/network/dnslookup/dnslookup.h b/examples/network/dnslookup/dnslookup.h
index 15355ccf51..6e521a3528 100644
--- a/examples/network/dnslookup/dnslookup.h
+++ b/examples/network/dnslookup/dnslookup.h
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2012 Jeremy Lainé <jeremy.laine@m4x.org>
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 Jeremy Lainé <jeremy.laine@m4x.org>
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/network/doc/src/blockingfortuneclient.qdoc b/examples/network/doc/src/blockingfortuneclient.qdoc
index fbbfd466a5..6719a4e0b9 100644
--- a/examples/network/doc/src/blockingfortuneclient.qdoc
+++ b/examples/network/doc/src/blockingfortuneclient.qdoc
@@ -1,7 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
**
@@ -11,8 +11,8 @@
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
** Foundation and appearing in the file included in the packaging of
** this file. Please review the following information to ensure
** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
** $QT_END_LICENSE$
**
****************************************************************************/
@@ -125,39 +125,22 @@
other \c waitFor...() functions, is part of QTcpSocket's \e{blocking
API}.
- After this statement, we have a connected socket to work with. Now it's
- time to see what the fortune server has sent us.
-
- \snippet blockingfortuneclient/fortunethread.cpp 9
- \snippet blockingfortuneclient/fortunethread.cpp 10
-
- This step is to read the size of the packet. Although we are only reading
- two bytes here, and the \c while loop may seem to overdo it, we present this
- code to demonstrate a good pattern for waiting for data using
- QTcpSocket::waitForReadyRead(). It goes like this: For as long as we still
- need more data, we call waitForReadyRead(). If it returns false,
- we abort the operation. After this statement, we know that we have received
- enough data.
+ After this statement, we have a connected socket to work with.
\snippet blockingfortuneclient/fortunethread.cpp 11
Now we can create a QDataStream object, passing the socket to
QDataStream's constructor, and as in the other client examples we set
- the stream protocol version to QDataStream::Qt_4_0, and read the size
- of the packet.
+ the stream protocol version to QDataStream::Qt_4_0.
\snippet blockingfortuneclient/fortunethread.cpp 12
- \snippet blockingfortuneclient/fortunethread.cpp 13
-
- Again, we'll use a loop that waits for more data by calling
- QTcpSocket::waitForReadyRead(). In this loop, we're waiting until
- QTcpSocket::bytesAvailable() returns the full packet size.
-
- \snippet blockingfortuneclient/fortunethread.cpp 14
- Now that we have all the data that we need, we can use QDataStream to
- read the fortune string from the packet. The resulting fortune is
- delivered by emitting newFortune().
+ We proceed by initiating a loop that waits for the fortune string data by
+ calling QTcpSocket::waitForReadyRead(). If it returns false, we abort the
+ operation. After this statement, we start a stream read transaction. We
+ exit the loop when QDataStream::commitTransaction() returns true, which
+ means successful fortune string loading. The resulting fortune is
+ delivered by emitting newFortune():
\snippet blockingfortuneclient/fortunethread.cpp 15
diff --git a/examples/network/doc/src/broadcastreceiver.qdoc b/examples/network/doc/src/broadcastreceiver.qdoc
index b9486229f0..f53358e936 100644
--- a/examples/network/doc/src/broadcastreceiver.qdoc
+++ b/examples/network/doc/src/broadcastreceiver.qdoc
@@ -1,7 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
**
@@ -11,8 +11,8 @@
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
** Foundation and appearing in the file included in the packaging of
** this file. Please review the following information to ensure
** the GNU Free Documentation License versi