From 83a5694dc21b8220bb0e5c85f24a53361b2fd478 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Wed, 28 Jan 2015 10:44:43 +0200 Subject: [PATCH] Update copyright headers Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Outdated header.LGPL removed (use header.LGPL21 instead) Old header.LGPL3 renamed to header.LGPL3-COMM to match actual licensing combination. New header.LGPL-COMM taken in the use file which were using old header.LGPL3 (src/plugins/platforms/android/extract.cpp) Added new header.LGPL3 containing Commercial + LGPLv3 + GPLv2 license combination Change-Id: I6f49b819a8a20cc4f88b794a8f6726d975e8ffbe Reviewed-by: Matti Paaso --- LGPL_EXCEPTION.txt | 2 +- LICENSE.LGPLv21 | 4 +- LICENSE.LGPLv3 | 4 +- LICENSE.PREVIEW.COMMERCIAL | 216 +++++++++--------- bin/fixqt4headers.pl | 36 ++- bin/syncqt.pl | 36 ++- config.tests/arch/arch.cpp | 14 +- config.tests/common/avx/avx.cpp | 14 +- config.tests/common/avx2/avx2.cpp | 12 +- config.tests/common/c++11/c++11.cpp | 14 +- config.tests/common/libproxy/libproxy.cpp | 38 ++- config.tests/common/sse2/sse2.cpp | 14 +- config.tests/common/sse3/sse3.cpp | 14 +- config.tests/common/sse4_1/sse4_1.cpp | 14 +- config.tests/common/sse4_2/sse4_2.cpp | 14 +- config.tests/common/ssse3/ssse3.cpp | 14 +- config.tests/mac/corewlan/corewlantest.mm | 38 ++- config.tests/qpa/direct2d/direct2d.cpp | 14 +- config.tests/qpa/directfb/directfb.cpp | 12 +- config.tests/qpa/egl-x11/egl-x11.cpp | 14 +- config.tests/qpa/egl/egl.cpp | 14 +- config.tests/qpa/kms/kms.cpp | 14 +- config.tests/qpa/linuxfb/linuxfb.cpp | 14 +- config.tests/qpa/xcb-glx/xcb-glx.cpp | 14 +- config.tests/qpa/xcb-render/xcb-render.cpp | 14 +- config.tests/qpa/xcb-syslibs/xcb.cpp | 14 +- config.tests/qpa/xcb-xkb/xcb-xkb.cpp | 14 +- config.tests/qpa/xcb-xlib/xcb-xlib.cpp | 14 +- config.tests/qpa/xcb/xcb.cpp | 14 +- config.tests/unix/alsa/alsatest.cpp | 14 +- .../unix/clock-gettime/clock-gettime.cpp | 14 +- .../unix/clock-monotonic/clock-monotonic.cpp | 14 +- config.tests/unix/cups/cups.cpp | 14 +- config.tests/unix/db2/db2.cpp | 14 +- config.tests/unix/dbus/dbus.cpp | 14 +- config.tests/unix/evdev/evdev.cpp | 14 +- config.tests/unix/eventfd/main.cpp | 12 +- config.tests/unix/floatmath/floatmath.cpp | 14 +- config.tests/unix/fontconfig/fontconfig.cpp | 14 +- config.tests/unix/freetype/freetype.cpp | 14 +- .../unix/getaddrinfo/getaddrinfotest.cpp | 14 +- config.tests/unix/getifaddrs/getifaddrs.cpp | 14 +- config.tests/unix/glib/glib.cpp | 14 +- .../unix/gnu-libiconv/gnu-libiconv.cpp | 14 +- config.tests/unix/harfbuzz/harfbuzz.cpp | 14 +- config.tests/unix/ibase/ibase.cpp | 14 +- config.tests/unix/iconv/iconv.cpp | 14 +- config.tests/unix/icu/icu.cpp | 14 +- config.tests/unix/inotify/inotifytest.cpp | 14 +- config.tests/unix/iodbc/iodbc.cpp | 14 +- config.tests/unix/ipc_posix/ipc.cpp | 38 ++- config.tests/unix/ipc_sysv/ipc.cpp | 38 ++- config.tests/unix/ipv6ifname/ipv6ifname.cpp | 14 +- .../unix/javascriptcore-jit/hwcap_test.cpp | 14 +- config.tests/unix/journald/journald.c | 12 +- config.tests/unix/lgmon/lgmon.cpp | 12 +- config.tests/unix/libinput/libinput.cpp | 14 +- config.tests/unix/libjpeg/libjpeg.cpp | 14 +- config.tests/unix/libpng/libpng.cpp | 14 +- config.tests/unix/libudev/libudev.cpp | 14 +- config.tests/unix/mips_dsp/mips_dsp.cpp | 14 +- config.tests/unix/mips_dspr2/mips_dspr2.cpp | 14 +- config.tests/unix/mremap/mremap.cpp | 14 +- config.tests/unix/mtdev/mtdev.cpp | 12 +- config.tests/unix/mysql/mysql.cpp | 14 +- config.tests/unix/nis/nis.cpp | 14 +- config.tests/unix/objcopy/objcopy.cpp | 12 +- config.tests/unix/oci/oci.cpp | 14 +- config.tests/unix/odbc/odbc.cpp | 14 +- .../unix/opengldesktop/opengldesktop.cpp | 14 +- config.tests/unix/opengles2/opengles2.cpp | 14 +- config.tests/unix/opengles3/opengles3.cpp | 14 +- config.tests/unix/opengles31/opengles31.cpp | 14 +- config.tests/unix/openssl/openssl.cpp | 14 +- config.tests/unix/openvg/openvg.cpp | 14 +- config.tests/unix/pcre/pcre.cpp | 12 +- .../unix/posix_fallocate/posix_fallocate.cpp | 14 +- config.tests/unix/pps/pps.cpp | 12 +- config.tests/unix/psql/psql.cpp | 14 +- config.tests/unix/ptrsize/ptrsizetest.cpp | 14 +- config.tests/unix/pulseaudio/pulseaudio.cpp | 14 +- config.tests/unix/qqnx_imf/qqnx_imf.cpp | 12 +- config.tests/unix/shivavg/shivavg.cpp | 14 +- config.tests/unix/slog2/slog2.cpp | 12 +- config.tests/unix/sqlite/sqlite.cpp | 14 +- config.tests/unix/sqlite2/sqlite2.cpp | 14 +- config.tests/unix/stdint/main.cpp | 14 +- config.tests/unix/stl/stltest.cpp | 14 +- config.tests/unix/tds/tds.cpp | 14 +- config.tests/unix/tslib/tslib.cpp | 14 +- config.tests/unix/xkbcommon/xkbcommon.cpp | 14 +- config.tests/unix/zlib/zlib.cpp | 14 +- config.tests/x11/glxfbconfig/glxfbconfig.cpp | 14 +- config.tests/x11/mitshm/mitshm.cpp | 14 +- config.tests/x11/notype/notypetest.cpp | 14 +- config.tests/x11/opengl/opengl.cpp | 14 +- config.tests/x11/xcursor/xcursor.cpp | 14 +- config.tests/x11/xfixes/xfixes.cpp | 14 +- config.tests/x11/xinerama/xinerama.cpp | 14 +- config.tests/x11/xinput/xinput.cpp | 14 +- config.tests/x11/xinput2/xinput2.cpp | 14 +- config.tests/x11/xkb/xkb.cpp | 14 +- config.tests/x11/xlib/xlib.cpp | 14 +- config.tests/x11/xrandr/xrandr.cpp | 14 +- config.tests/x11/xrender/xrender.cpp | 14 +- config.tests/x11/xshape/xshape.cpp | 14 +- config.tests/x11/xsync/xsync.cpp | 14 +- config.tests/x11/xvideo/xvideo.cpp | 14 +- configure | 18 +- configure.bat | 14 +- doc/global/config.qdocconf | 2 +- .../externalsites/external-resources.qdoc | 12 +- doc/global/externalsites/qt-webpages.qdoc | 12 +- doc/global/externalsites/qtcreator.qdoc | 12 +- doc/global/externalsites/rfc.qdoc | 12 +- doc/global/html-footer.qdocconf | 6 +- doc/global/includes-online/search.qdoc | 12 +- doc/global/qt-module-defaults-online.qdocconf | 6 +- doc/src/examples/bearermonitor.qdoc | 12 +- doc/src/examples/complexpingpong.qdoc | 12 +- doc/src/examples/customtypesending.qdoc | 12 +- doc/src/examples/dbus-chat.qdoc | 12 +- doc/src/examples/digiflip.qdoc | 12 +- doc/src/examples/fingerpaint.qdoc | 12 +- doc/src/examples/flickable.qdoc | 12 +- doc/src/examples/flightinfo.qdoc | 12 +- doc/src/examples/htmlinfo.qdoc | 12 +- doc/src/examples/lightmaps.qdoc | 12 +- doc/src/examples/pinchzoom.qdoc | 12 +- doc/src/examples/raycasting.qdoc | 12 +- doc/src/examples/rsslisting.qdoc | 12 +- doc/src/examples/styleexample.qdoc | 12 +- .../code/doc_src_examples_simpledommodel.cpp | 10 +- .../code/doc_src_examples_svgalib.qdoc | 10 +- .../src_corelib_codecs_qtextcodecplugin.cpp | 10 +- .../code/src_corelib_tools_qqueue.cpp | 10 +- .../code/src_corelib_tools_qvector.cpp | 10 +- .../snippets/code/src_gui_image_qbitmap.cpp | 10 +- .../snippets/code/src_gui_kernel_qsound.cpp | 10 +- .../code/src_network_access_qhttp.cpp | 10 +- .../code/src_sql_kernel_qsqlindex.cpp | 10 +- doc/src/snippets/pointer/pointer.cpp | 10 +- doc/src/snippets/quiloader/main.cpp | 10 +- doc/src/snippets/quiloader/mywidget.cpp | 10 +- .../ipc/doc/src/localfortuneclient.qdoc | 12 +- .../ipc/doc/src/localfortuneserver.qdoc | 12 +- .../corelib/ipc/doc/src/sharedmemory.qdoc | 12 +- .../corelib/ipc/localfortuneclient/client.cpp | 10 +- .../corelib/ipc/localfortuneclient/client.h | 10 +- .../corelib/ipc/localfortuneclient/main.cpp | 10 +- .../corelib/ipc/localfortuneserver/main.cpp | 10 +- .../corelib/ipc/localfortuneserver/server.cpp | 10 +- .../corelib/ipc/localfortuneserver/server.h | 10 +- examples/corelib/ipc/sharedmemory/dialog.cpp | 10 +- examples/corelib/ipc/sharedmemory/dialog.h | 10 +- examples/corelib/ipc/sharedmemory/main.cpp | 10 +- examples/corelib/json/savegame/character.cpp | 10 +- examples/corelib/json/savegame/character.h | 10 +- .../json/savegame/doc/src/savegame.qdoc | 12 +- examples/corelib/json/savegame/game.cpp | 10 +- examples/corelib/json/savegame/game.h | 10 +- examples/corelib/json/savegame/level.cpp | 10 +- examples/corelib/json/savegame/level.h | 10 +- examples/corelib/json/savegame/main.cpp | 10 +- .../corelib/threads/doc/src/mandelbrot.qdoc | 12 +- .../threads/doc/src/queuedcustomtype.qdoc | 12 +- .../corelib/threads/doc/src/semaphores.qdoc | 12 +- .../threads/doc/src/waitconditions.qdoc | 12 +- examples/corelib/threads/mandelbrot/main.cpp | 10 +- .../threads/mandelbrot/mandelbrotwidget.cpp | 10 +- .../threads/mandelbrot/mandelbrotwidget.h | 10 +- .../threads/mandelbrot/renderthread.cpp | 10 +- .../corelib/threads/mandelbrot/renderthread.h | 10 +- .../threads/queuedcustomtype/block.cpp | 10 +- .../corelib/threads/queuedcustomtype/block.h | 10 +- .../corelib/threads/queuedcustomtype/main.cpp | 10 +- .../threads/queuedcustomtype/renderthread.cpp | 10 +- .../threads/queuedcustomtype/renderthread.h | 10 +- .../threads/queuedcustomtype/window.cpp | 10 +- .../corelib/threads/queuedcustomtype/window.h | 10 +- .../corelib/threads/semaphores/semaphores.cpp | 10 +- .../threads/waitconditions/waitconditions.cpp | 10 +- .../corelib/tools/contiguouscache/main.cpp | 10 +- .../tools/contiguouscache/randomlistmodel.cpp | 10 +- .../tools/contiguouscache/randomlistmodel.h | 10 +- examples/corelib/tools/customtype/main.cpp | 10 +- examples/corelib/tools/customtype/message.cpp | 10 +- examples/corelib/tools/customtype/message.h | 10 +- .../corelib/tools/customtypesending/main.cpp | 10 +- .../tools/customtypesending/message.cpp | 10 +- .../corelib/tools/customtypesending/message.h | 10 +- .../tools/customtypesending/window.cpp | 10 +- .../corelib/tools/customtypesending/window.h | 10 +- .../tools/doc/src/contiguouscache.qdoc | 12 +- .../corelib/tools/doc/src/customtype.qdoc | 12 +- examples/dbus/chat/chat.cpp | 10 +- examples/dbus/chat/chat.h | 10 +- examples/dbus/complexpingpong/complexping.cpp | 10 +- examples/dbus/complexpingpong/complexping.h | 10 +- examples/dbus/complexpingpong/complexpong.cpp | 10 +- examples/dbus/complexpingpong/complexpong.h | 10 +- examples/dbus/complexpingpong/ping-common.h | 10 +- examples/dbus/doc/src/chat.qdoc | 12 +- examples/dbus/doc/src/complexpingpong.qdoc | 12 +- examples/dbus/doc/src/listnames.qdoc | 12 +- examples/dbus/doc/src/pingpong.qdoc | 12 +- examples/dbus/listnames/listnames.cpp | 10 +- examples/dbus/pingpong/ping-common.h | 10 +- examples/dbus/pingpong/ping.cpp | 10 +- examples/dbus/pingpong/pong.cpp | 10 +- examples/dbus/pingpong/pong.h | 10 +- examples/dbus/remotecontrolledcar/car/car.cpp | 10 +- examples/dbus/remotecontrolledcar/car/car.h | 10 +- .../dbus/remotecontrolledcar/car/main.cpp | 10 +- .../controller/controller.cpp | 10 +- .../controller/controller.h | 10 +- .../remotecontrolledcar/controller/main.cpp | 10 +- .../doc/src/dbus-remotecontrolledcar.qdoc | 12 +- examples/embedded/digiflip/digiflip.cpp | 14 +- examples/embedded/flickable/flickable.cpp | 14 +- examples/embedded/flickable/flickable.h | 14 +- examples/embedded/flickable/main.cpp | 14 +- examples/embedded/flightinfo/flightinfo.cpp | 14 +- examples/embedded/lightmaps/lightmaps.cpp | 14 +- examples/embedded/lightmaps/lightmaps.h | 14 +- examples/embedded/lightmaps/main.cpp | 14 +- examples/embedded/lightmaps/mapzoom.cpp | 14 +- examples/embedded/lightmaps/mapzoom.h | 14 +- examples/embedded/lightmaps/slippymap.cpp | 16 +- examples/embedded/lightmaps/slippymap.h | 14 +- examples/embedded/raycasting/raycasting.cpp | 14 +- examples/embedded/styleexample/main.cpp | 14 +- .../embedded/styleexample/stylewidget.cpp | 14 +- examples/embedded/styleexample/stylewidget.h | 14 +- examples/gui/analogclock/main.cpp | 10 +- examples/gui/doc/src/analogclockwindow.qdoc | 12 +- examples/gui/doc/src/openglwindow.qdoc | 12 +- examples/gui/doc/src/rasterwindow.qdoc | 12 +- examples/gui/openglwindow/main.cpp | 10 +- examples/gui/openglwindow/openglwindow.cpp | 10 +- examples/gui/openglwindow/openglwindow.h | 10 +- examples/gui/rasterwindow/main.cpp | 10 +- examples/gui/rasterwindow/rasterwindow.cpp | 10 +- examples/gui/rasterwindow/rasterwindow.h | 10 +- .../network/bearermonitor/bearermonitor.cpp | 10 +- .../network/bearermonitor/bearermonitor.h | 10 +- examples/network/bearermonitor/main.cpp | 10 +- .../network/bearermonitor/sessionwidget.cpp | 10 +- .../network/bearermonitor/sessionwidget.h | 10 +- .../blockingfortuneclient/blockingclient.cpp | 10 +- .../blockingfortuneclient/blockingclient.h | 10 +- .../blockingfortuneclient/fortunethread.cpp | 10 +- .../blockingfortuneclient/fortunethread.h | 10 +- .../network/blockingfortuneclient/main.cpp | 10 +- examples/network/broadcastreceiver/main.cpp | 10 +- .../network/broadcastreceiver/receiver.cpp | 10 +- examples/network/broadcastreceiver/receiver.h | 10 +- examples/network/broadcastsender/main.cpp | 10 +- examples/network/broadcastsender/sender.cpp | 10 +- examples/network/broadcastsender/sender.h | 10 +- examples/network/dnslookup/dnslookup.cpp | 8 +- examples/network/dnslookup/dnslookup.h | 8 +- .../doc/src/blockingfortuneclient.qdoc | 12 +- .../network/doc/src/broadcastreceiver.qdoc | 12 +- examples/network/doc/src/broadcastsender.qdoc | 12 +- examples/network/doc/src/fortuneclient.qdoc | 12 +- examples/network/doc/src/fortuneserver.qdoc | 12 +- examples/network/doc/src/googlesuggest.qdoc | 12 +- examples/network/doc/src/http.qdoc | 12 +- examples/network/doc/src/loopback.qdoc | 12 +- .../network/doc/src/multicastreceiver.qdoc | 12 +- examples/network/doc/src/multicastsender.qdoc | 12 +- examples/network/doc/src/network-chat.qdoc | 12 +- .../network/doc/src/network-download.qdoc | 12 +- .../doc/src/network-downloadmanager.qdoc | 12 +- .../network/doc/src/securesocketclient.qdoc | 12 +- .../doc/src/threadedfortuneserver.qdoc | 12 +- examples/network/doc/src/torrent.qdoc | 12 +- examples/network/download/main.cpp | 10 +- .../downloadmanager/downloadmanager.cpp | 10 +- .../network/downloadmanager/downloadmanager.h | 10 +- examples/network/downloadmanager/main.cpp | 10 +- .../downloadmanager/textprogressbar.cpp | 10 +- .../network/downloadmanager/textprogressbar.h | 10 +- examples/network/fortuneclient/client.cpp | 10 +- examples/network/fortuneclient/client.h | 10 +- examples/network/fortuneclient/main.cpp | 10 +- examples/network/fortuneserver/main.cpp | 10 +- examples/network/fortuneserver/server.cpp | 10 +- examples/network/fortuneserver/server.h | 10 +- .../network/googlesuggest/googlesuggest.cpp | 10 +- .../network/googlesuggest/googlesuggest.h | 10 +- examples/network/googlesuggest/main.cpp | 10 +- examples/network/googlesuggest/searchbox.cpp | 10 +- examples/network/googlesuggest/searchbox.h | 10 +- examples/network/http/httpwindow.cpp | 10 +- examples/network/http/httpwindow.h | 10 +- examples/network/http/main.cpp | 10 +- examples/network/loopback/dialog.cpp | 10 +- examples/network/loopback/dialog.h | 10 +- examples/network/loopback/main.cpp | 10 +- examples/network/multicastreceiver/main.cpp | 10 +- .../network/multicastreceiver/receiver.cpp | 10 +- examples/network/multicastreceiver/receiver.h | 10 +- examples/network/multicastsender/main.cpp | 10 +- examples/network/multicastsender/sender.cpp | 10 +- examples/network/multicastsender/sender.h | 10 +- examples/network/network-chat/chatdialog.cpp | 10 +- examples/network/network-chat/chatdialog.h | 10 +- examples/network/network-chat/client.cpp | 10 +- examples/network/network-chat/client.h | 10 +- examples/network/network-chat/connection.cpp | 10 +- examples/network/network-chat/connection.h | 10 +- examples/network/network-chat/main.cpp | 10 +- examples/network/network-chat/peermanager.cpp | 10 +- examples/network/network-chat/peermanager.h | 10 +- examples/network/network-chat/server.cpp | 10 +- examples/network/network-chat/server.h | 10 +- .../securesocketclient/certificateinfo.cpp | 10 +- .../securesocketclient/certificateinfo.h | 10 +- examples/network/securesocketclient/main.cpp | 10 +- .../network/securesocketclient/sslclient.cpp | 10 +- .../network/securesocketclient/sslclient.h | 10 +- .../network/threadedfortuneserver/dialog.cpp | 10 +- .../network/threadedfortuneserver/dialog.h | 10 +- .../threadedfortuneserver/fortuneserver.cpp | 10 +- .../threadedfortuneserver/fortuneserver.h | 10 +- .../threadedfortuneserver/fortunethread.cpp | 10 +- .../threadedfortuneserver/fortunethread.h | 10 +- .../network/threadedfortuneserver/main.cpp | 10 +- examples/network/torrent/addtorrentdialog.cpp | 10 +- examples/network/torrent/addtorrentdialog.h | 10 +- examples/network/torrent/bencodeparser.cpp | 10 +- examples/network/torrent/bencodeparser.h | 10 +- .../network/torrent/connectionmanager.cpp | 10 +- examples/network/torrent/connectionmanager.h | 10 +- examples/network/torrent/filemanager.cpp | 10 +- examples/network/torrent/filemanager.h | 10 +- examples/network/torrent/main.cpp | 10 +- examples/network/torrent/mainwindow.cpp | 10 +- examples/network/torrent/mainwindow.h | 10 +- examples/network/torrent/metainfo.cpp | 10 +- examples/network/torrent/metainfo.h | 10 +- examples/network/torrent/peerwireclient.cpp | 10 +- examples/network/torrent/peerwireclient.h | 10 +- examples/network/torrent/ratecontroller.cpp | 10 +- examples/network/torrent/ratecontroller.h | 10 +- examples/network/torrent/torrentclient.cpp | 10 +- examples/network/torrent/torrentclient.h | 10 +- examples/network/torrent/torrentserver.cpp | 10 +- examples/network/torrent/torrentserver.h | 10 +- examples/network/torrent/trackerclient.cpp | 10 +- examples/network/torrent/trackerclient.h | 10 +- examples/opengl/2dpainting/glwidget.cpp | 10 +- examples/opengl/2dpainting/glwidget.h | 10 +- examples/opengl/2dpainting/helper.cpp | 10 +- examples/opengl/2dpainting/helper.h | 10 +- examples/opengl/2dpainting/main.cpp | 10 +- examples/opengl/2dpainting/widget.cpp | 10 +- examples/opengl/2dpainting/widget.h | 10 +- examples/opengl/2dpainting/window.cpp | 10 +- examples/opengl/2dpainting/window.h | 10 +- examples/opengl/contextinfo/main.cpp | 10 +- examples/opengl/contextinfo/renderwindow.cpp | 10 +- examples/opengl/contextinfo/renderwindow.h | 10 +- examples/opengl/contextinfo/widget.cpp | 10 +- examples/opengl/contextinfo/widget.h | 10 +- examples/opengl/cube/geometryengine.cpp | 10 +- examples/opengl/cube/geometryengine.h | 10 +- examples/opengl/cube/main.cpp | 10 +- examples/opengl/cube/mainwidget.cpp | 10 +- examples/opengl/cube/mainwidget.h | 10 +- examples/opengl/doc/src/2dpainting.qdoc | 12 +- examples/opengl/doc/src/cube.qdoc | 12 +- examples/opengl/doc/src/hellogl2.qdoc | 12 +- examples/opengl/doc/src/textures.qdoc | 12 +- examples/opengl/hellogl2/glwidget.cpp | 10 +- examples/opengl/hellogl2/glwidget.h | 10 +- examples/opengl/hellogl2/logo.cpp | 10 +- examples/opengl/hellogl2/logo.h | 10 +- examples/opengl/hellogl2/main.cpp | 10 +- examples/opengl/hellogl2/mainwindow.cpp | 10 +- examples/opengl/hellogl2/mainwindow.h | 10 +- examples/opengl/hellogl2/window.cpp | 10 +- examples/opengl/hellogl2/window.h | 10 +- examples/opengl/hellowindow/hellowindow.cpp | 10 +- examples/opengl/hellowindow/hellowindow.h | 10 +- examples/opengl/hellowindow/main.cpp | 10 +- .../legacy/framebufferobject2/glwidget.cpp | 10 +- .../legacy/framebufferobject2/glwidget.h | 10 +- .../opengl/legacy/framebufferobject2/main.cpp | 10 +- examples/opengl/legacy/grabber/glwidget.cpp | 10 +- examples/opengl/legacy/grabber/glwidget.h | 10 +- examples/opengl/legacy/grabber/main.cpp | 10 +- examples/opengl/legacy/grabber/mainwindow.cpp | 10 +- examples/opengl/legacy/grabber/mainwindow.h | 10 +- examples/opengl/legacy/hellogl/glwidget.cpp | 10 +- examples/opengl/legacy/hellogl/glwidget.h | 10 +- examples/opengl/legacy/hellogl/main.cpp | 10 +- examples/opengl/legacy/hellogl/window.cpp | 10 +- examples/opengl/legacy/hellogl/window.h | 10 +- .../opengl/legacy/overpainting/bubble.cpp | 10 +- examples/opengl/legacy/overpainting/bubble.h | 10 +- .../opengl/legacy/overpainting/glwidget.cpp | 10 +- .../opengl/legacy/overpainting/glwidget.h | 10 +- examples/opengl/legacy/overpainting/main.cpp | 10 +- examples/opengl/legacy/pbuffers/cube.cpp | 10 +- examples/opengl/legacy/pbuffers/cube.h | 10 +- examples/opengl/legacy/pbuffers/glwidget.cpp | 10 +- examples/opengl/legacy/pbuffers/glwidget.h | 10 +- examples/opengl/legacy/pbuffers/main.cpp | 10 +- examples/opengl/legacy/pbuffers2/glwidget.cpp | 10 +- examples/opengl/legacy/pbuffers2/glwidget.h | 10 +- examples/opengl/legacy/pbuffers2/main.cpp | 10 +- .../opengl/legacy/samplebuffers/glwidget.cpp | 10 +- .../opengl/legacy/samplebuffers/glwidget.h | 10 +- examples/opengl/legacy/samplebuffers/main.cpp | 10 +- examples/opengl/legacy/shared/qtlogo.cpp | 10 +- examples/opengl/legacy/shared/qtlogo.h | 10 +- examples/opengl/paintedwindow/main.cpp | 10 +- .../opengl/paintedwindow/paintedwindow.cpp | 10 +- examples/opengl/paintedwindow/paintedwindow.h | 10 +- examples/opengl/qopenglwidget/bubble.cpp | 10 +- examples/opengl/qopenglwidget/bubble.h | 10 +- examples/opengl/qopenglwidget/glwidget.cpp | 10 +- examples/opengl/qopenglwidget/glwidget.h | 10 +- examples/opengl/qopenglwidget/main.cpp | 10 +- examples/opengl/qopenglwidget/mainwindow.cpp | 10 +- examples/opengl/qopenglwidget/mainwindow.h | 10 +- .../qopenglwindow/background_renderer.cpp | 10 +- .../qopenglwindow/background_renderer.h | 10 +- examples/opengl/qopenglwindow/main.cpp | 10 +- examples/opengl/textures/glwidget.cpp | 10 +- examples/opengl/textures/glwidget.h | 10 +- examples/opengl/textures/main.cpp | 10 +- examples/opengl/textures/window.cpp | 10 +- examples/opengl/textures/window.h | 10 +- .../opengl/threadedqopenglwidget/glwidget.cpp | 10 +- .../opengl/threadedqopenglwidget/glwidget.h | 10 +- .../opengl/threadedqopenglwidget/main.cpp | 10 +- .../threadedqopenglwidget/mainwindow.cpp | 10 +- .../opengl/threadedqopenglwidget/mainwindow.h | 10 +- examples/qmake/precompile/main.cpp | 10 +- examples/qmake/precompile/mydialog.cpp | 10 +- examples/qmake/precompile/mydialog.h | 10 +- examples/qmake/precompile/myobject.cpp | 10 +- examples/qmake/precompile/myobject.h | 10 +- examples/qmake/precompile/stable.h | 10 +- examples/qmake/precompile/util.cpp | 10 +- examples/qmake/tutorial/hello.cpp | 10 +- examples/qmake/tutorial/hello.h | 10 +- examples/qmake/tutorial/hellounix.cpp | 10 +- examples/qmake/tutorial/hellowin.cpp | 10 +- examples/qmake/tutorial/main.cpp | 10 +- examples/qpa/qrasterwindow/main.cpp | 10 +- examples/qpa/windows/main.cpp | 10 +- examples/qpa/windows/window.cpp | 10 +- examples/qpa/windows/window.h | 10 +- .../doc/src/qtconcurrent-imagescaling.qdoc | 12 +- .../imagescaling/imagescaling.cpp | 10 +- .../qtconcurrent/imagescaling/imagescaling.h | 10 +- examples/qtconcurrent/imagescaling/main.cpp | 10 +- .../map/doc/src/qtconcurrent-map.qdoc | 12 +- examples/qtconcurrent/map/main.cpp | 10 +- .../doc/src/qtconcurrent-progressdialog.qdoc | 12 +- examples/qtconcurrent/progressdialog/main.cpp | 10 +- .../doc/src/qtconcurrent-runfunction.qdoc | 12 +- examples/qtconcurrent/runfunction/main.cpp | 10 +- .../doc/src/qtconcurrent-wordcount.qdoc | 12 +- examples/qtconcurrent/wordcount/main.cpp | 10 +- examples/qtestlib/tutorial1/testqstring.cpp | 10 +- examples/qtestlib/tutorial2/testqstring.cpp | 10 +- examples/qtestlib/tutorial3/testgui.cpp | 10 +- examples/qtestlib/tutorial4/testgui.cpp | 10 +- examples/qtestlib/tutorial5/benchmarking.cpp | 10 +- examples/qtestlib/tutorial5/containers.cpp | 10 +- examples/sql/books/bookdelegate.cpp | 14 +- examples/sql/books/bookdelegate.h | 14 +- examples/sql/books/bookwindow.cpp | 14 +- examples/sql/books/bookwindow.h | 14 +- examples/sql/books/initdb.h | 14 +- examples/sql/books/main.cpp | 14 +- examples/sql/cachedtable/main.cpp | 10 +- examples/sql/cachedtable/tableeditor.cpp | 10 +- examples/sql/cachedtable/tableeditor.h | 10 +- examples/sql/connection.h | 10 +- examples/sql/doc/src/books.qdoc | 12 +- examples/sql/doc/src/cachedtable.qdoc | 12 +- examples/sql/doc/src/drilldown.qdoc | 12 +- examples/sql/doc/src/masterdetail.qdoc | 12 +- examples/sql/doc/src/querymodel.qdoc | 12 +- .../sql/doc/src/relationaltablemodel.qdoc | 12 +- examples/sql/doc/src/sqlbrowser.qdoc | 12 +- examples/sql/doc/src/sqlwidgetmapper.qdoc | 12 +- examples/sql/doc/src/tablemodel.qdoc | 12 +- examples/sql/drilldown/imageitem.cpp | 10 +- examples/sql/drilldown/imageitem.h | 10 +- examples/sql/drilldown/informationwindow.cpp | 10 +- examples/sql/drilldown/informationwindow.h | 10 +- examples/sql/drilldown/main.cpp | 10 +- examples/sql/drilldown/view.cpp | 10 +- examples/sql/drilldown/view.h | 10 +- examples/sql/masterdetail/database.h | 10 +- examples/sql/masterdetail/dialog.cpp | 10 +- examples/sql/masterdetail/dialog.h | 10 +- examples/sql/masterdetail/main.cpp | 10 +- examples/sql/masterdetail/mainwindow.cpp | 10 +- examples/sql/masterdetail/mainwindow.h | 10 +- examples/sql/querymodel/customsqlmodel.cpp | 10 +- examples/sql/querymodel/customsqlmodel.h | 10 +- examples/sql/querymodel/editablesqlmodel.cpp | 10 +- examples/sql/querymodel/editablesqlmodel.h | 10 +- examples/sql/querymodel/main.cpp | 10 +- .../relationaltablemodel.cpp | 10 +- examples/sql/sqlbrowser/browser.cpp | 14 +- examples/sql/sqlbrowser/browser.h | 14 +- examples/sql/sqlbrowser/connectionwidget.cpp | 14 +- examples/sql/sqlbrowser/connectionwidget.h | 14 +- examples/sql/sqlbrowser/main.cpp | 14 +- .../sql/sqlbrowser/qsqlconnectiondialog.cpp | 14 +- .../sql/sqlbrowser/qsqlconnectiondialog.h | 14 +- examples/sql/sqlwidgetmapper/main.cpp | 10 +- examples/sql/sqlwidgetmapper/window.cpp | 10 +- examples/sql/sqlwidgetmapper/window.h | 10 +- examples/sql/tablemodel/tablemodel.cpp | 10 +- examples/touch/dials/doc/src/touch-dials.qdoc | 12 +- examples/touch/dials/main.cpp | 10 +- examples/touch/fingerpaint/main.cpp | 10 +- examples/touch/fingerpaint/mainwindow.cpp | 10 +- examples/touch/fingerpaint/mainwindow.h | 10 +- examples/touch/fingerpaint/scribblearea.cpp | 10 +- examples/touch/fingerpaint/scribblearea.h | 10 +- examples/touch/knobs/doc/src/touch-knobs.qdoc | 12 +- examples/touch/knobs/knob.cpp | 10 +- examples/touch/knobs/knob.h | 10 +- examples/touch/knobs/main.cpp | 10 +- examples/touch/pinchzoom/graphicsview.cpp | 10 +- examples/touch/pinchzoom/graphicsview.h | 10 +- examples/touch/pinchzoom/main.cpp | 10 +- examples/touch/pinchzoom/mouse.cpp | 10 +- examples/touch/pinchzoom/mouse.h | 10 +- examples/webkit/webkit-guide/_copyright.txt | 11 +- .../webkit/webkit-guide/_image_assets.htm | 10 +- examples/webkit/webkit-guide/_index.html | 8 +- examples/webkit/webkit-guide/anim_accord.htm | 10 +- .../webkit/webkit-guide/anim_demo-rotate.htm | 10 +- .../webkit/webkit-guide/anim_demo-scale.htm | 10 +- .../webkit/webkit-guide/anim_demo-skew.htm | 10 +- examples/webkit/webkit-guide/anim_gallery.htm | 10 +- examples/webkit/webkit-guide/anim_panel.htm | 10 +- examples/webkit/webkit-guide/anim_pulse.htm | 10 +- examples/webkit/webkit-guide/anim_skew.htm | 10 +- examples/webkit/webkit-guide/anim_slide1.htm | 10 +- examples/webkit/webkit-guide/anim_slide2.htm | 10 +- examples/webkit/webkit-guide/anim_slide3.htm | 10 +- .../webkit/webkit-guide/anim_tabbedSkew.htm | 10 +- .../webkit/webkit-guide/css/anim_accord.css | 10 +- .../webkit-guide/css/anim_demo-rotate.css | 10 +- .../webkit-guide/css/anim_demo-scale.css | 10 +- .../webkit-guide/css/anim_demo-skew.css | 10 +- .../webkit/webkit-guide/css/anim_gallery.css | 10 +- .../webkit/webkit-guide/css/anim_panel.css | 10 +- .../webkit/webkit-guide/css/anim_pulse.css | 10 +- .../webkit/webkit-guide/css/anim_skew.css | 10 +- .../webkit/webkit-guide/css/anim_slide.css | 10 +- .../webkit-guide/css/anim_tabbedSkew.css | 10 +- .../webkit-guide/css/css3_backgrounds.css | 10 +- .../webkit-guide/css/css3_border-img.css | 10 +- .../webkit-guide/css/css3_grad-radial.css | 10 +- .../webkit-guide/css/css3_gradientBack.css | 10 +- .../css/css3_gradientBackStop.css | 10 +- .../webkit-guide/css/css3_gradientButton.css | 10 +- .../webkit-guide/css/css3_mask-grad.css | 10 +- .../webkit/webkit-guide/css/css3_mask-img.css | 10 +- .../webkit/webkit-guide/css/css3_multicol.css | 10 +- .../webkit/webkit-guide/css/css3_reflect.css | 10 +- .../webkit/webkit-guide/css/css3_scroll.css | 10 +- .../webkit/webkit-guide/css/css3_sel-nth.css | 10 +- .../webkit/webkit-guide/css/css3_shadow.css | 10 +- .../webkit-guide/css/css3_shadowBlur.css | 10 +- .../webkit-guide/css/css3_text-overflow.css | 10 +- .../webkit-guide/css/css3_text-shadow.css | 10 +- .../webkit-guide/css/css3_text-stroke.css | 10 +- .../webkit/webkit-guide/css/form_tapper.css | 10 +- .../webkit/webkit-guide/css/form_toggler.css | 10 +- .../webkit-guide/css/layout_link-fmt.css | 10 +- .../webkit-guide/css/layout_tbl-keyhole.css | 10 +- .../webkit/webkit-guide/css/mob_condjs.css | 10 +- .../webkit-guide/css/mob_mediaquery.css | 10 +- examples/webkit/webkit-guide/css/mobile.css | 10 +- .../webkit/webkit-guide/css/mq_desktop.css | 10 +- .../webkit/webkit-guide/css/mq_mobile.css | 10 +- examples/webkit/webkit-guide/css/mq_touch.css | 10 +- .../webkit-guide/css/mqlayout_desktop.css | 10 +- .../webkit-guide/css/mqlayout_mobile.css | 10 +- .../webkit-guide/css/mqlayout_touch.css | 10 +- examples/webkit/webkit-guide/css/storage.css | 10 +- .../webkit/webkit-guide/css3_backgrounds.htm | 10 +- .../webkit/webkit-guide/css3_border-img.htm | 10 +- .../webkit/webkit-guide/css3_grad-radial.htm | 10 +- .../webkit/webkit-guide/css3_gradientBack.htm | 10 +- .../webkit-guide/css3_gradientBackStop.htm | 10 +- .../webkit-guide/css3_gradientButton.htm | 10 +- .../webkit/webkit-guide/css3_mask-grad.htm | 10 +- .../webkit/webkit-guide/css3_mask-img.htm | 10 +- .../webkit/webkit-guide/css3_multicol.htm | 10 +- examples/webkit/webkit-guide/css3_reflect.htm | 10 +- examples/webkit/webkit-guide/css3_scroll.htm | 10 +- examples/webkit/webkit-guide/css3_sel-nth.htm | 10 +- examples/webkit/webkit-guide/css3_shadow.htm | 10 +- .../webkit-guide/css3_text-overflow.htm | 10 +- .../webkit/webkit-guide/css3_text-shadow.htm | 10 +- .../webkit/webkit-guide/css3_text-stroke.htm | 10 +- examples/webkit/webkit-guide/form_tapper.htm | 10 +- examples/webkit/webkit-guide/form_toggler.htm | 10 +- .../webkit/webkit-guide/js/anim_accord.js | 10 +- .../webkit/webkit-guide/js/anim_gallery.js | 10 +- examples/webkit/webkit-guide/js/anim_panel.js | 10 +- examples/webkit/webkit-guide/js/anim_skew.js | 10 +- .../webkit-guide/js/css3_backgrounds.js | 10 +- .../webkit/webkit-guide/js/css3_border-img.js | 10 +- .../webkit-guide/js/css3_grad-radial.js | 10 +- .../webkit/webkit-guide/js/css3_mask-grad.js | 10 +- .../webkit/webkit-guide/js/css3_mask-img.js | 10 +- .../webkit-guide/js/css3_text-overflow.js | 10 +- .../webkit/webkit-guide/js/form_tapper.js | 10 +- examples/webkit/webkit-guide/js/mob_condjs.js | 10 +- examples/webkit/webkit-guide/js/mobile.js | 10 +- examples/webkit/webkit-guide/js/storage.js | 10 +- .../webkit/webkit-guide/layout_link-fmt.htm | 10 +- .../webkit-guide/layout_tbl-keyhole.htm | 10 +- examples/webkit/webkit-guide/mob_condjs.htm | 10 +- examples/webkit/webkit-guide/mob_layout.htm | 10 +- .../webkit/webkit-guide/mob_mediaquery.htm | 10 +- examples/webkit/webkit-guide/storage.htm | 10 +- .../widgets/animation/animatedtiles/main.cpp | 10 +- .../widgets/animation/appchooser/main.cpp | 10 +- examples/widgets/animation/easing/animation.h | 10 +- examples/widgets/animation/easing/main.cpp | 10 +- examples/widgets/animation/easing/window.cpp | 10 +- examples/widgets/animation/easing/window.h | 10 +- .../widgets/animation/moveblocks/main.cpp | 10 +- examples/widgets/animation/states/main.cpp | 10 +- .../widgets/animation/stickman/animation.cpp | 10 +- .../widgets/animation/stickman/animation.h | 10 +- .../animation/stickman/graphicsview.cpp | 10 +- .../widgets/animation/stickman/graphicsview.h | 10 +- .../widgets/animation/stickman/lifecycle.cpp | 10 +- .../widgets/animation/stickman/lifecycle.h | 10 +- examples/widgets/animation/stickman/main.cpp | 10 +- examples/widgets/animation/stickman/node.cpp | 10 +- examples/widgets/animation/stickman/node.h | 10 +- .../widgets/animation/stickman/rectbutton.cpp | 10 +- .../widgets/animation/stickman/rectbutton.h | 10 +- .../widgets/animation/stickman/stickman.cpp | 10 +- .../widgets/animation/stickman/stickman.h | 10 +- .../animation/sub-attaq/animationmanager.cpp | 14 +- .../animation/sub-attaq/animationmanager.h | 14 +- examples/widgets/animation/sub-attaq/boat.cpp | 14 +- examples/widgets/animation/sub-attaq/boat.h | 14 +- examples/widgets/animation/sub-attaq/boat_p.h | 14 +- examples/widgets/animation/sub-attaq/bomb.cpp | 14 +- examples/widgets/animation/sub-attaq/bomb.h | 14 +- .../animation/sub-attaq/graphicsscene.cpp | 14 +- .../animation/sub-attaq/graphicsscene.h | 14 +- examples/widgets/animation/sub-attaq/main.cpp | 14 +- .../animation/sub-attaq/mainwindow.cpp | 14 +- .../widgets/animation/sub-attaq/mainwindow.h | 14 +- .../animation/sub-attaq/pixmapitem.cpp | 14 +- .../widgets/animation/sub-attaq/pixmapitem.h | 14 +- .../animation/sub-attaq/progressitem.cpp | 14 +- .../animation/sub-attaq/progressitem.h | 14 +- .../animation/sub-attaq/qanimationstate.cpp | 14 +- .../animation/sub-attaq/qanimationstate.h | 14 +- .../widgets/animation/sub-attaq/states.cpp | 14 +- examples/widgets/animation/sub-attaq/states.h | 14 +- .../widgets/animation/sub-attaq/submarine.cpp | 14 +- .../widgets/animation/sub-attaq/submarine.h | 14 +- .../widgets/animation/sub-attaq/submarine_p.h | 14 +- .../sub-attaq/textinformationitem.cpp | 14 +- .../animation/sub-attaq/textinformationitem.h | 14 +- .../widgets/animation/sub-attaq/torpedo.cpp | 14 +- .../widgets/animation/sub-attaq/torpedo.h | 14 +- examples/widgets/desktop/screenshot/main.cpp | 10 +- .../widgets/desktop/screenshot/screenshot.cpp | 10 +- .../widgets/desktop/screenshot/screenshot.h | 10 +- examples/widgets/desktop/systray/main.cpp | 10 +- examples/widgets/desktop/systray/window.cpp | 10 +- examples/widgets/desktop/systray/window.h | 10 +- .../dialogs/classwizard/classwizard.cpp | 10 +- .../widgets/dialogs/classwizard/classwizard.h | 10 +- examples/widgets/dialogs/classwizard/main.cpp | 10 +- .../dialogs/configdialog/configdialog.cpp | 10 +- .../dialogs/configdialog/configdialog.h | 10 +- .../widgets/dialogs/configdialog/main.cpp | 10 +- .../widgets/dialogs/configdialog/pages.cpp | 10 +- examples/widgets/dialogs/configdialog/pages.h | 10 +- .../widgets/dialogs/extension/finddialog.cpp | 10 +- .../widgets/dialogs/extension/finddialog.h | 10 +- examples/widgets/dialogs/extension/main.cpp | 10 +- examples/widgets/dialogs/findfiles/main.cpp | 10 +- examples/widgets/dialogs/findfiles/window.cpp | 10 +- examples/widgets/dialogs/findfiles/window.h | 10 +- .../dialogs/licensewizard/licensewizard.cpp | 10 +- .../dialogs/licensewizard/licensewizard.h | 10 +- .../widgets/dialogs/licensewizard/main.cpp | 10 +- examples/widgets/dialogs/sipdialog/dialog.cpp | 10 +- examples/widgets/dialogs/sipdialog/dialog.h | 10 +- examples/widgets/dialogs/sipdialog/main.cpp | 10 +- .../dialogs/standarddialogs/dialog.cpp | 10 +- .../widgets/dialogs/standarddialogs/dialog.h | 10 +- .../widgets/dialogs/standarddialogs/main.cpp | 10 +- examples/widgets/dialogs/tabdialog/main.cpp | 10 +- .../widgets/dialogs/tabdialog/tabdialog.cpp | 10 +- .../widgets/dialogs/tabdialog/tabdialog.h | 10 +- .../dialogs/trivialwizard/trivialwizard.cpp | 10 +- examples/widgets/doc/dropsite.qdoc | 12 +- examples/widgets/doc/mousebuttons.qdoc | 12 +- .../widgets/doc/src/addressbook-tutorial.qdoc | 12 +- examples/widgets/doc/src/addressbook.qdoc | 12 +- examples/widgets/doc/src/affine.qdoc | 12 +- examples/widgets/doc/src/analogclock.qdoc | 12 +- examples/widgets/doc/src/animatedtiles.qdoc | 12 +- examples/widgets/doc/src/appchooser.qdoc | 12 +- examples/widgets/doc/src/application.qdoc | 12 +- examples/widgets/doc/src/basicdrawing.qdoc | 12 +- .../widgets/doc/src/basicgraphicslayouts.qdoc | 12 +- examples/widgets/doc/src/basiclayouts.qdoc | 12 +- .../widgets/doc/src/basicsortfiltermodel.qdoc | 12 +- examples/widgets/doc/src/blurpicker.qdoc | 12 +- examples/widgets/doc/src/borderlayout.qdoc | 12 +- examples/widgets/doc/src/boxes.qdoc | 12 +- examples/widgets/doc/src/calculator.qdoc | 12 +- examples/widgets/doc/src/calendar.qdoc | 12 +- examples/widgets/doc/src/calendarwidget.qdoc | 12 +- examples/widgets/doc/src/charactermap.qdoc | 12 +- examples/widgets/doc/src/chart.qdoc | 12 +- examples/widgets/doc/src/chip.qdoc | 12 +- examples/widgets/doc/src/classwizard.qdoc | 12 +- examples/widgets/doc/src/codeeditor.qdoc | 12 +- .../doc/src/collidingmice-example.qdoc | 12 +- .../widgets/doc/src/coloreditorfactory.qdoc | 12 +- .../widgets/doc/src/combowidgetmapper.qdoc | 12 +- examples/widgets/doc/src/completer.qdoc | 12 +- examples/widgets/doc/src/composition.qdoc | 12 +- .../widgets/doc/src/concentriccircles.qdoc | 12 +- examples/widgets/doc/src/configdialog.qdoc | 12 +- .../doc/src/customsortfiltermodel.qdoc | 12 +- examples/widgets/doc/src/deform.qdoc | 12 +- examples/widgets/doc/src/diagramscene.qdoc | 12 +- examples/widgets/doc/src/digitalclock.qdoc | 12 +- examples/widgets/doc/src/dirview.qdoc | 12 +- examples/widgets/doc/src/dockwidgets.qdoc | 12 +- .../widgets/doc/src/draganddroppuzzle.qdoc | 12 +- examples/widgets/doc/src/dragdroprobot.qdoc | 12 +- examples/widgets/doc/src/draggableicons.qdoc | 12 +- examples/widgets/doc/src/draggabletext.qdoc | 12 +- examples/widgets/doc/src/dynamiclayouts.qdoc | 12 +- examples/widgets/doc/src/easing.qdoc | 12 +- examples/widgets/doc/src/echoplugin.qdoc | 12 +- .../widgets/doc/src/editabletreemodel.qdoc | 12 +- examples/widgets/doc/src/elasticnodes.qdoc | 12 +- examples/widgets/doc/src/elidedlabel.qdoc | 12 +- examples/widgets/doc/src/embeddeddialogs.qdoc | 12 +- .../widgets/doc/src/eventtransitions.qdoc | 12 +- examples/widgets/doc/src/extension.qdoc | 12 +- examples/widgets/doc/src/factorial.qdoc | 12 +- examples/widgets/doc/src/fademessage.qdoc | 12 +- examples/widgets/doc/src/fetchmore.qdoc | 12 +- examples/widgets/doc/src/findfiles.qdoc | 12 +- examples/widgets/doc/src/flowlayout.qdoc | 12 +- examples/widgets/doc/src/fontsampler.qdoc | 12 +- examples/widgets/doc/src/fridgemagnets.qdoc | 12 +- examples/widgets/doc/src/frozencolumn.qdoc | 12 +- examples/widgets/doc/src/gradients.qdoc | 12 +- .../doc/src/graphicsview-anchorlayout.qdoc | 12 +- .../doc/src/graphicsview-flowlayout.qdoc | 12 +- .../src/graphicsview-simpleanchorlayout.qdoc | 12 +- .../src/graphicsview-weatheranchorlayout.qdoc | 12 +- examples/widgets/doc/src/groupbox.qdoc | 12 +- examples/widgets/doc/src/i18n.qdoc | 12 +- examples/widgets/doc/src/icons.qdoc | 12 +- .../widgets/doc/src/imagecomposition.qdoc | 12 +- examples/widgets/doc/src/imageviewer.qdoc | 12 +- examples/widgets/doc/src/interview.qdoc | 12 +- examples/widgets/doc/src/itemviewspuzzle.qdoc | 12 +- examples/widgets/doc/src/licensewizard.qdoc | 12 +- examples/widgets/doc/src/lighting.qdoc | 12 +- examples/widgets/doc/src/lineedits.qdoc | 12 +- examples/widgets/doc/src/mainwindow.qdoc | 12 +- examples/widgets/doc/src/mdi.qdoc | 12 +- examples/widgets/doc/src/menus.qdoc | 12 +- examples/widgets/doc/src/moveblocks.qdoc | 12 +- examples/widgets/doc/src/movie.qdoc | 12 +- examples/widgets/doc/src/orderform.qdoc | 12 +- examples/widgets/doc/src/padnavigator.qdoc | 12 +- examples/widgets/doc/src/painterpaths.qdoc | 12 +- examples/widgets/doc/src/pathstroke.qdoc | 12 +- examples/widgets/doc/src/pingpong.qdoc | 12 +- examples/widgets/doc/src/pixelator.qdoc | 12 +- examples/widgets/doc/src/plugandpaint.qdoc | 12 +- examples/widgets/doc/src/recentfiles.qdoc | 12 +- examples/widgets/doc/src/regexp.qdoc | 12 +- examples/widgets/doc/src/rogue.qdoc | 12 +- examples/widgets/doc/src/screenshot.qdoc | 12 +- examples/widgets/doc/src/scribble.qdoc | 12 +- examples/widgets/doc/src/sdi.qdoc | 12 +- examples/widgets/doc/src/settingseditor.qdoc | 12 +- examples/widgets/doc/src/shapedclock.qdoc | 12 +- examples/widgets/doc/src/simpledommodel.qdoc | 12 +- examples/widgets/doc/src/simpletreemodel.qdoc | 12 +- .../widgets/doc/src/simplewidgetmapper.qdoc | 12 +- examples/widgets/doc/src/sipdialog.qdoc | 12 +- examples/widgets/doc/src/sliders.qdoc | 12 +- examples/widgets/doc/src/spinboxdelegate.qdoc | 12 +- examples/widgets/doc/src/spinboxes.qdoc | 12 +- examples/widgets/doc/src/spreadsheet.qdoc | 12 +- examples/widgets/doc/src/standarddialogs.qdoc | 12 +- examples/widgets/doc/src/stardelegate.qdoc | 12 +- examples/widgets/doc/src/states.qdoc | 12 +- examples/widgets/doc/src/stickman.qdoc | 12 +- examples/widgets/doc/src/styleplugin.qdoc | 12 +- examples/widgets/doc/src/styles.qdoc | 12 +- examples/widgets/doc/src/stylesheet.qdoc | 12 +- examples/widgets/doc/src/sub-attaq.qdoc | 12 +- .../widgets/doc/src/syntaxhighlighter.qdoc | 12 +- examples/widgets/doc/src/tabdialog.qdoc | 12 +- examples/widgets/doc/src/tablet.qdoc | 12 +- examples/widgets/doc/src/tetrix.qdoc | 12 +- examples/widgets/doc/src/textedit.qdoc | 12 +- examples/widgets/doc/src/tooltips.qdoc | 12 +- examples/widgets/doc/src/trafficlight.qdoc | 12 +- examples/widgets/doc/src/transformations.qdoc | 12 +- .../widgets/doc/src/treemodelcompleter.qdoc | 12 +- examples/widgets/doc/src/trivialwizard.qdoc | 12 +- examples/widgets/doc/src/twowaybutton.qdoc | 12 +- examples/widgets/doc/src/undo.qdoc | 12 +- examples/widgets/doc/src/undoframework.qdoc | 12 +- examples/widgets/doc/src/validators.qdoc | 12 +- examples/widgets/doc/src/wiggly.qdoc | 12 +- examples/widgets/doc/src/windowflags.qdoc | 12 +- .../draganddrop/draggableicons/dragwidget.cpp | 10 +- .../draganddrop/draggableicons/dragwidget.h | 10 +- .../draganddrop/draggableicons/main.cpp | 10 +- .../draganddrop/draggabletext/draglabel.cpp | 10 +- .../draganddrop/draggabletext/draglabel.h | 10 +- .../draganddrop/draggabletext/dragwidget.cpp | 10 +- .../draganddrop/draggabletext/dragwidget.h | 10 +- .../draganddrop/draggabletext/main.cpp | 10 +- .../widgets/draganddrop/dropsite/droparea.cpp | 10 +- .../widgets/draganddrop/dropsite/droparea.h | 10 +- .../draganddrop/dropsite/dropsitewindow.cpp | 10 +- .../draganddrop/dropsite/dropsitewindow.h | 10 +- .../widgets/draganddrop/dropsite/main.cpp | 10 +- .../draganddrop/fridgemagnets/draglabel.cpp | 10 +- .../draganddrop/fridgemagnets/draglabel.h | 10 +- .../draganddrop/fridgemagnets/dragwidget.cpp | 10 +- .../draganddrop/fridgemagnets/dragwidget.h | 10 +- .../draganddrop/fridgemagnets/main.cpp | 10 +- examples/widgets/draganddrop/puzzle/main.cpp | 10 +- .../widgets/draganddrop/puzzle/mainwindow.cpp | 10 +- .../widgets/draganddrop/puzzle/mainwindow.h | 10 +- .../widgets/draganddrop/puzzle/pieceslist.cpp | 10 +- .../widgets/draganddrop/puzzle/pieceslist.h | 10 +- .../draganddrop/puzzle/puzzlewidget.cpp | 10 +- .../widgets/draganddrop/puzzle/puzzlewidget.h | 10 +- .../widgets/effects/blurpicker/blureffect.cpp | 10 +- .../widgets/effects/blurpicker/blureffect.h | 10 +- .../widgets/effects/blurpicker/blurpicker.cpp | 10 +- .../widgets/effects/blurpicker/blurpicker.h | 10 +- examples/widgets/effects/blurpicker/main.cpp | 10 +- .../effects/fademessage/fademessage.cpp | 10 +- .../widgets/effects/fademessage/fademessage.h | 10 +- examples/widgets/effects/fademessage/main.cpp | 10 +- .../widgets/effects/lighting/lighting.cpp | 10 +- examples/widgets/effects/lighting/lighting.h | 10 +- examples/widgets/effects/lighting/main.cpp | 10 +- .../imagegestures/doc/src/imagegestures.qdoc | 12 +- .../gestures/imagegestures/imagewidget.cpp | 10 +- .../gestures/imagegestures/imagewidget.h | 10 +- .../widgets/gestures/imagegestures/main.cpp | 10 +- .../gestures/imagegestures/mainwidget.cpp | 10 +- .../gestures/imagegestures/mainwidget.h | 10 +- .../graphicsview/anchorlayout/main.cpp | 10 +- .../basicgraphicslayouts/layoutitem.cpp | 10 +- .../basicgraphicslayouts/layoutitem.h | 10 +- .../basicgraphicslayouts/main.cpp | 10 +- .../basicgraphicslayouts/window.cpp | 10 +- .../basicgraphicslayouts/window.h | 10 +- examples/widgets/graphicsview/boxes/basic.fsh | 36 ++- examples/widgets/graphicsview/boxes/basic.vsh | 38 ++- .../widgets/graphicsview/boxes/dotted.fsh | 38 ++- .../widgets/graphicsview/boxes/fresnel.fsh | 36 ++- examples/widgets/graphicsview/boxes/glass.fsh | 36 ++- .../widgets/graphicsview/boxes/glbuffers.cpp | 14 +- .../widgets/graphicsview/boxes/glbuffers.h | 14 +- .../graphicsview/boxes/glextensions.cpp | 14 +- .../widgets/graphicsview/boxes/glextensions.h | 14 +- .../graphicsview/boxes/gltrianglemesh.h | 14 +- .../widgets/graphicsview/boxes/granite.fsh | 36 ++- examples/widgets/graphicsview/boxes/main.cpp | 14 +- .../widgets/graphicsview/boxes/marble.fsh | 38 ++- examples/widgets/graphicsview/boxes/qtbox.cpp | 14 +- examples/widgets/graphicsview/boxes/qtbox.h | 14 +- .../widgets/graphicsview/boxes/reflection.fsh | 38 ++- .../widgets/graphicsview/boxes/refraction.fsh | 38 ++- .../widgets/graphicsview/boxes/roundedbox.cpp | 14 +- .../widgets/graphicsview/boxes/roundedbox.h | 14 +- examples/widgets/graphicsview/boxes/scene.cpp | 14 +- examples/widgets/graphicsview/boxes/scene.h | 14 +- .../widgets/graphicsview/boxes/trackball.cpp | 14 +- .../widgets/graphicsview/boxes/trackball.h | 14 +- examples/widgets/graphicsview/boxes/wood.fsh | 38 ++- examples/widgets/graphicsview/chip/chip.cpp | 14 +- examples/widgets/graphicsview/chip/chip.h | 14 +- examples/widgets/graphicsview/chip/main.cpp | 14 +- .../widgets/graphicsview/chip/mainwindow.cpp | 14 +- .../widgets/graphicsview/chip/mainwindow.h | 14 +- examples/widgets/graphicsview/chip/view.cpp | 14 +- examples/widgets/graphicsview/chip/view.h | 14 +- .../graphicsview/collidingmice/main.cpp | 10 +- .../graphicsview/collidingmice/mouse.cpp | 10 +- .../graphicsview/collidingmice/mouse.h | 10 +- .../graphicsview/diagramscene/arrow.cpp | 10 +- .../widgets/graphicsview/diagramscene/arrow.h | 10 +- .../graphicsview/diagramscene/diagramitem.cpp | 10 +- .../graphicsview/diagramscene/diagramitem.h | 10 +- .../diagramscene/diagramscene.cpp | 10 +- .../graphicsview/diagramscene/diagramscene.h | 10 +- .../diagramscene/diagramtextitem.cpp | 10 +- .../diagramscene/diagramtextitem.h | 10 +- .../graphicsview/diagramscene/main.cpp | 10 +- .../graphicsview/diagramscene/mainwindow.cpp | 10 +- .../graphicsview/diagramscene/mainwindow.h | 10 +- .../graphicsview/dragdroprobot/coloritem.cpp | 10 +- .../graphicsview/dragdroprobot/coloritem.h | 10 +- .../graphicsview/dragdroprobot/main.cpp | 10 +- .../graphicsview/dragdroprobot/robot.cpp | 10 +- .../graphicsview/dragdroprobot/robot.h | 10 +- .../graphicsview/elasticnodes/edge.cpp | 10 +- .../widgets/graphicsview/elasticnodes/edge.h | 10 +- .../graphicsview/elasticnodes/graphwidget.cpp | 10 +- .../graphicsview/elasticnodes/graphwidget.h | 10 +- .../graphicsview/elasticnodes/main.cpp | 10 +- .../graphicsview/elasticnodes/node.cpp | 10 +- .../widgets/graphicsview/elasticnodes/node.h | 10 +- .../embeddeddialogs/customproxy.cpp | 14 +- .../embeddeddialogs/customproxy.h | 14 +- .../embeddeddialogs/embeddeddialog.cpp | 14 +- .../embeddeddialogs/embeddeddialog.h | 14 +- .../graphicsview/embeddeddialogs/main.cpp | 14 +- .../graphicsview/flowlayout/flowlayout.cpp | 10 +- .../graphicsview/flowlayout/flowlayout.h | 10 +- .../widgets/graphicsview/flowlayout/main.cpp | 10 +- .../graphicsview/flowlayout/window.cpp | 10 +- .../widgets/graphicsview/flowlayout/window.h | 10 +- .../padnavigator/flippablepad.cpp | 10 +- .../graphicsview/padnavigator/flippablepad.h | 10 +- .../graphicsview/padnavigator/main.cpp | 10 +- .../padnavigator/padnavigator.cpp | 10 +- .../graphicsview/padnavigator/padnavigator.h | 10 +- .../padnavigator/roundrectitem.cpp | 10 +- .../graphicsview/padnavigator/roundrectitem.h | 10 +- .../graphicsview/padnavigator/splashitem.cpp | 10 +- .../graphicsview/padnavigator/splashitem.h | 10 +- .../graphicsview/simpleanchorlayout/main.cpp | 10 +- .../graphicsview/weatheranchorlayout/main.cpp | 10 +- .../itemviews/addressbook/adddialog.cpp | 10 +- .../widgets/itemviews/addressbook/adddialog.h | 10 +- .../itemviews/addressbook/addresswidget.cpp | 10 +- .../itemviews/addressbook/addresswidget.h | 10 +- .../widgets/itemviews/addressbook/main.cpp | 10 +- .../itemviews/addressbook/mainwindow.cpp | 10 +- .../itemviews/addressbook/mainwindow.h | 10 +- .../itemviews/addressbook/newaddresstab.cpp | 10 +- .../itemviews/addressbook/newaddresstab.h | 10 +- .../itemviews/addressbook/tablemodel.cpp | 10 +- .../itemviews/addressbook/tablemodel.h | 10 +- .../itemviews/basicsortfiltermodel/main.cpp | 10 +- .../itemviews/basicsortfiltermodel/window.cpp | 10 +- .../itemviews/basicsortfiltermodel/window.h | 10 +- examples/widgets/itemviews/chart/main.cpp | 10 +- .../widgets/itemviews/chart/mainwindow.cpp | 10 +- examples/widgets/itemviews/chart/mainwindow.h | 10 +- examples/widgets/itemviews/chart/pieview.cpp | 10 +- examples/widgets/itemviews/chart/pieview.h | 10 +- .../coloreditorfactory/colorlisteditor.cpp | 10 +- .../coloreditorfactory/colorlisteditor.h | 10 +- .../itemviews/coloreditorfactory/main.cpp | 10 +- .../itemviews/coloreditorfactory/window.cpp | 10 +- .../itemviews/coloreditorfactory/window.h | 10 +- .../itemviews/combowidgetmapper/main.cpp | 10 +- .../itemviews/combowidgetmapper/window.cpp | 10 +- .../itemviews/combowidgetmapper/window.h | 10 +- .../customsortfiltermodel/filterwidget.cpp | 10 +- .../customsortfiltermodel/filterwidget.h | 10 +- .../itemviews/customsortfiltermodel/main.cpp | 10 +- .../mysortfilterproxymodel.cpp | 10 +- .../mysortfilterproxymodel.h | 10 +- .../customsortfiltermodel/window.cpp | 10 +- .../itemviews/customsortfiltermodel/window.h | 10 +- examples/widgets/itemviews/dirview/main.cpp | 10 +- .../itemviews/editabletreemodel/main.cpp | 10 +- .../editabletreemodel/mainwindow.cpp | 10 +- .../itemviews/editabletreemodel/mainwindow.h | 10 +- .../itemviews/editabletreemodel/treeitem.cpp | 10 +- .../itemviews/editabletreemodel/treeitem.h | 10 +- .../itemviews/editabletreemodel/treemodel.cpp | 10 +- .../itemviews/editabletreemodel/treemodel.h | 10 +- .../itemviews/fetchmore/filelistmodel.cpp | 10 +- .../itemviews/fetchmore/filelistmodel.h | 10 +- examples/widgets/itemviews/fetchmore/main.cpp | 10 +- .../widgets/itemviews/fetchmore/window.cpp | 10 +- examples/widgets/itemviews/fetchmore/window.h | 10 +- .../frozencolumn/freezetablewidget.cpp | 10 +- .../frozencolumn/freezetablewidget.h | 10 +- .../widgets/itemviews/frozencolumn/main.cpp | 10 +- examples/widgets/itemviews/interview/main.cpp | 14 +- .../widgets/itemviews/interview/model.cpp | 14 +- examples/widgets/itemviews/interview/model.h | 14 +- .../itemviews/pixelator/imagemodel.cpp | 10 +- .../widgets/itemviews/pixelator/imagemodel.h | 10 +- examples/widgets/itemviews/pixelator/main.cpp | 10 +- .../itemviews/pixelator/mainwindow.cpp | 10 +- .../widgets/itemviews/pixelator/mainwindow.h | 10 +- .../itemviews/pixelator/pixeldelegate.cpp | 10 +- .../itemviews/pixelator/pixeldelegate.h | 10 +- examples/widgets/itemviews/puzzle/main.cpp | 10 +- .../widgets/itemviews/puzzle/mainwindow.cpp | 10 +- .../widgets/itemviews/puzzle/mainwindow.h | 10 +- .../widgets/itemviews/puzzle/piecesmodel.cpp | 10 +- .../widgets/itemviews/puzzle/piecesmodel.h | 10 +- .../widgets/itemviews/puzzle/puzzlewidget.cpp | 10 +- .../widgets/itemviews/puzzle/puzzlewidget.h | 10 +- .../itemviews/simpledommodel/domitem.cpp | 10 +- .../itemviews/simpledommodel/domitem.h | 10 +- .../itemviews/simpledommodel/dommodel.cpp | 10 +- .../itemviews/simpledommodel/dommodel.h | 10 +- .../widgets/itemviews/simpledommodel/main.cpp | 10 +- .../itemviews/simpledommodel/mainwindow.cpp | 10 +- .../itemviews/simpledommodel/mainwindow.h | 10 +- .../itemviews/simpletreemodel/main.cpp | 10 +- .../itemviews/simpletreemodel/treeitem.cpp | 10 +- .../itemviews/simpletreemodel/treeitem.h | 10 +- .../itemviews/simpletreemodel/treemodel.cpp | 10 +- .../itemviews/simpletreemodel/treemodel.h | 10 +- .../itemviews/simplewidgetmapper/main.cpp | 10 +- .../itemviews/simplewidgetmapper/window.cpp | 10 +- .../itemviews/simplewidgetmapper/window.h | 10 +- .../itemviews/spinboxdelegate/delegate.cpp | 10 +- .../itemviews/spinboxdelegate/delegate.h | 10 +- .../itemviews/spinboxdelegate/main.cpp | 10 +- .../widgets/itemviews/spreadsheet/main.cpp | 14 +- .../itemviews/spreadsheet/printview.cpp | 14 +- .../widgets/itemviews/spreadsheet/printview.h | 14 +- .../itemviews/spreadsheet/spreadsheet.cpp | 14 +- .../itemviews/spreadsheet/spreadsheet.h | 14 +- .../spreadsheet/spreadsheetdelegate.cpp | 14 +- .../spreadsheet/spreadsheetdelegate.h | 14 +- .../itemviews/spreadsheet/spreadsheetitem.cpp | 14 +- .../itemviews/spreadsheet/spreadsheetitem.h | 14 +- .../widgets/itemviews/stardelegate/main.cpp | 10 +- .../itemviews/stardelegate/stardelegate.cpp | 10 +- .../itemviews/stardelegate/stardelegate.h | 10 +- .../itemviews/stardelegate/stareditor.cpp | 10 +- .../itemviews/stardelegate/stareditor.h | 10 +- .../itemviews/stardelegate/starrating.cpp | 10 +- .../itemviews/stardelegate/starrating.h | 10 +- .../widgets/itemviews/storageview/main.cpp | 10 +- .../itemviews/storageview/storagemodel.cpp | 10 +- .../itemviews/storageview/storagemodel.h | 10 +- .../widgets/layouts/basiclayouts/dialog.cpp | 10 +- .../widgets/layouts/basiclayouts/dialog.h | 10 +- .../widgets/layouts/basiclayouts/main.cpp | 10 +- .../layouts/borderlayout/borderlayout.cpp | 10 +- .../layouts/borderlayout/borderlayout.h | 10 +- .../widgets/layouts/borderlayout/main.cpp | 10 +- .../widgets/layouts/borderlayout/window.cpp | 10 +- .../widgets/layouts/borderlayout/window.h | 10 +- .../widgets/layouts/dynamiclayouts/dialog.cpp | 10 +- .../widgets/layouts/dynamiclayouts/dialog.h | 10 +- .../widgets/layouts/dynamiclayouts/main.cpp | 10 +- .../widgets/layouts/flowlayout/flowlayout.cpp | 10 +- .../widgets/layouts/flowlayout/flowlayout.h | 10 +- examples/widgets/layouts/flowlayout/main.cpp | 10 +- .../widgets/layouts/flowlayout/window.cpp | 10 +- examples/widgets/layouts/flowlayout/window.h | 10 +- .../mac/qmaccocoaviewcontainer/main.mm | 38 ++- examples/widgets/mac/qmacnativewidget/main.mm | 36 ++- .../widgets/mainwindows/application/main.cpp | 10 +- .../mainwindows/application/mainwindow.cpp | 10 +- .../mainwindows/application/mainwindow.h | 10 +- .../widgets/mainwindows/dockwidgets/main.cpp | 10 +- .../mainwindows/dockwidgets/mainwindow.cpp | 10 +- .../mainwindows/dockwidgets/mainwindow.h | 10 +- .../mainwindows/mainwindow/colorswatch.cpp | 14 +- .../mainwindows/mainwindow/colorswatch.h | 14 +- .../widgets/mainwindows/mainwindow/main.cpp | 14 +- .../mainwindows/mainwindow/mainwindow.cpp | 14 +- .../mainwindows/mainwindow/mainwindow.h | 14 +- .../mainwindows/mainwindow/toolbar.cpp | 14 +- .../widgets/mainwindows/mainwindow/toolbar.h | 14 +- examples/widgets/mainwindows/mdi/main.cpp | 10 +- .../widgets/mainwindows/mdi/mainwindow.cpp | 10 +- examples/widgets/mainwindows/mdi/mainwindow.h | 10 +- examples/widgets/mainwindows/mdi/mdichild.cpp | 10 +- examples/widgets/mainwindows/mdi/mdichild.h | 10 +- examples/widgets/mainwindows/menus/main.cpp | 10 +- .../widgets/mainwindows/menus/mainwindow.cpp | 10 +- .../widgets/mainwindows/menus/mainwindow.h | 10 +- .../widgets/mainwindows/recentfiles/main.cpp | 10 +- .../mainwindows/recentfiles/mainwindow.cpp | 10 +- .../mainwindows/recentfiles/mainwindow.h | 10 +- examples/widgets/mainwindows/sdi/main.cpp | 10 +- .../widgets/mainwindows/sdi/mainwindow.cpp | 10 +- examples/widgets/mainwindows/sdi/mainwindow.h | 10 +- examples/widgets/painting/affine/main.cpp | 14 +- examples/widgets/painting/affine/xform.cpp | 14 +- examples/widgets/painting/affine/xform.h | 14 +- .../widgets/painting/basicdrawing/main.cpp | 10 +- .../painting/basicdrawing/renderarea.cpp | 14 +- .../painting/basicdrawing/renderarea.h | 10 +- .../widgets/painting/basicdrawing/window.cpp | 10 +- .../widgets/painting/basicdrawing/window.h | 10 +- .../painting/composition/composition.cpp | 14 +- .../painting/composition/composition.h | 14 +- .../widgets/painting/composition/main.cpp | 14 +- .../concentriccircles/circlewidget.cpp | 10 +- .../painting/concentriccircles/circlewidget.h | 10 +- .../painting/concentriccircles/main.cpp | 10 +- .../painting/concentriccircles/window.cpp | 10 +- .../painting/concentriccircles/window.h | 10 +- examples/widgets/painting/deform/main.cpp | 14 +- .../widgets/painting/deform/pathdeform.cpp | 14 +- examples/widgets/painting/deform/pathdeform.h | 14 +- .../widgets/painting/fontsampler/main.cpp | 10 +- .../painting/fontsampler/mainwindow.cpp | 10 +- .../widgets/painting/fontsampler/mainwindow.h | 10 +- .../widgets/painting/gradients/gradients.cpp | 14 +- .../widgets/painting/gradients/gradients.h | 14 +- examples/widgets/painting/gradients/main.cpp | 14 +- .../imagecomposition/imagecomposer.cpp | 10 +- .../painting/imagecomposition/imagecomposer.h | 10 +- .../painting/imagecomposition/main.cpp | 10 +- .../widgets/painting/painterpaths/main.cpp | 10 +- .../painting/painterpaths/renderarea.cpp | 10 +- .../painting/painterpaths/renderarea.h | 10 +- .../widgets/painting/painterpaths/window.cpp | 10 +- .../widgets/painting/painterpaths/window.h | 10 +- examples/widgets/painting/pathstroke/main.cpp | 14 +- .../painting/pathstroke/pathstroke.cpp | 14 +- .../widgets/painting/pathstroke/pathstroke.h | 14 +- .../widgets/painting/shared/arthurstyle.cpp | 14 +- .../widgets/painting/shared/arthurstyle.h | 14 +- .../widgets/painting/shared/arthurwidgets.cpp | 14 +- .../widgets/painting/shared/arthurwidgets.h | 14 +- .../widgets/painting/shared/hoverpoints.cpp | 14 +- .../widgets/painting/shared/hoverpoints.h | 14 +- .../widgets/painting/transformations/main.cpp | 10 +- .../painting/transformations/renderarea.cpp | 10 +- .../painting/transformations/renderarea.h | 10 +- .../painting/transformations/window.cpp | 10 +- .../widgets/painting/transformations/window.h | 10 +- examples/widgets/richtext/calendar/main.cpp | 10 +- .../widgets/richtext/calendar/mainwindow.cpp | 10 +- .../widgets/richtext/calendar/mainwindow.h | 10 +- .../richtext/orderform/detailsdialog.cpp | 10 +- .../richtext/orderform/detailsdialog.h | 10 +- examples/widgets/richtext/orderform/main.cpp | 10 +- .../widgets/richtext/orderform/mainwindow.cpp | 10 +- .../widgets/richtext/orderform/mainwindow.h | 10 +- .../syntaxhighlighter/highlighter.cpp | 10 +- .../richtext/syntaxhighlighter/highlighter.h | 10 +- .../richtext/syntaxhighlighter/main.cpp | 10 +- .../richtext/syntaxhighlighter/mainwindow.cpp | 10 +- .../richtext/syntaxhighlighter/mainwindow.h | 10 +- examples/widgets/richtext/textedit/main.cpp | 14 +- .../widgets/richtext/textedit/textedit.cpp | 14 +- examples/widgets/richtext/textedit/textedit.h | 14 +- .../widgets/richtext/textedit/textedit.qdoc | 12 +- .../widgets/scroller/graphicsview/main.cpp | 10 +- .../statemachine/eventtransitions/main.cpp | 10 +- .../widgets/statemachine/factorial/main.cpp | 10 +- .../widgets/statemachine/pingpong/main.cpp | 10 +- examples/widgets/statemachine/rogue/main.cpp | 10 +- .../statemachine/rogue/movementtransition.h | 10 +- .../widgets/statemachine/rogue/window.cpp | 10 +- examples/widgets/statemachine/rogue/window.h | 10 +- .../statemachine/trafficlight/main.cpp | 10 +- .../statemachine/twowaybutton/main.cpp | 10 +- .../widgets/tools/codecs/doc/src/codecs.qdoc | 12 +- examples/widgets/tools/codecs/main.cpp | 10 +- examples/widgets/tools/codecs/mainwindow.cpp | 10 +- examples/widgets/tools/codecs/mainwindow.h | 10 +- examples/widgets/tools/codecs/previewform.cpp | 10 +- examples/widgets/tools/codecs/previewform.h | 10 +- examples/widgets/tools/completer/fsmodel.cpp | 10 +- examples/widgets/tools/completer/fsmodel.h | 10 +- examples/widgets/tools/completer/main.cpp | 10 +- .../widgets/tools/completer/mainwindow.cpp | 10 +- examples/widgets/tools/completer/mainwindow.h | 10 +- .../doc/src/customcompleter.qdoc | 12 +- .../widgets/tools/customcompleter/main.cpp | 10 +- .../tools/customcompleter/mainwindow.cpp | 10 +- .../tools/customcompleter/mainwindow.h | 10 +- .../tools/customcompleter/textedit.cpp | 10 +- .../widgets/tools/customcompleter/textedit.h | 10 +- .../echoplugin/echowindow/echointerface.h | 10 +- .../echoplugin/echowindow/echowindow.cpp | 10 +- .../tools/echoplugin/echowindow/echowindow.h | 10 +- .../tools/echoplugin/echowindow/main.cpp | 10 +- .../tools/echoplugin/plugin/echoplugin.cpp | 10 +- .../tools/echoplugin/plugin/echoplugin.h | 10 +- .../widgets/tools/i18n/languagechooser.cpp | 10 +- examples/widgets/tools/i18n/languagechooser.h | 10 +- examples/widgets/tools/i18n/main.cpp | 10 +- examples/widgets/tools/i18n/mainwindow.cpp | 10 +- examples/widgets/tools/i18n/mainwindow.h | 10 +- .../widgets/tools/plugandpaint/interfaces.h | 10 +- examples/widgets/tools/plugandpaint/main.cpp | 10 +- .../widgets/tools/plugandpaint/mainwindow.cpp | 10 +- .../widgets/tools/plugandpaint/mainwindow.h | 10 +- .../widgets/tools/plugandpaint/paintarea.cpp | 10 +- .../widgets/tools/plugandpaint/paintarea.h | 10 +- .../tools/plugandpaint/plugindialog.cpp | 10 +- .../widgets/tools/plugandpaint/plugindialog.h | 10 +- .../basictools/basictoolsplugin.cpp | 10 +- .../basictools/basictoolsplugin.h | 10 +- .../extrafilters/extrafiltersplugin.cpp | 10 +- .../extrafilters/extrafiltersplugin.h | 10 +- examples/widgets/tools/regexp/main.cpp | 10 +- .../widgets/tools/regexp/regexpdialog.cpp | 10 +- examples/widgets/tools/regexp/regexpdialog.h | 10 +- .../tools/settingseditor/locationdialog.cpp | 10 +- .../tools/settingseditor/locationdialog.h | 10 +- .../widgets/tools/settingseditor/main.cpp | 10 +- .../tools/settingseditor/mainwindow.cpp | 10 +- .../widgets/tools/settingseditor/mainwindow.h | 10 +- .../tools/settingseditor/settingstree.cpp | 10 +- .../tools/settingseditor/settingstree.h | 10 +- .../tools/settingseditor/variantdelegate.cpp | 10 +- .../tools/settingseditor/variantdelegate.h | 10 +- .../tools/styleplugin/plugin/simplestyle.cpp | 10 +- .../tools/styleplugin/plugin/simplestyle.h | 10 +- .../styleplugin/plugin/simplestyleplugin.cpp | 10 +- .../styleplugin/plugin/simplestyleplugin.h | 10 +- .../tools/styleplugin/stylewindow/main.cpp | 10 +- .../styleplugin/stylewindow/stylewindow.cpp | 10 +- .../styleplugin/stylewindow/stylewindow.h | 10 +- .../widgets/tools/treemodelcompleter/main.cpp | 10 +- .../tools/treemodelcompleter/mainwindow.cpp | 10 +- .../tools/treemodelcompleter/mainwindow.h | 10 +- .../treemodelcompleter/treemodelcompleter.cpp | 10 +- .../treemodelcompleter/treemodelcompleter.h | 10 +- examples/widgets/tools/undo/commands.cpp | 14 +- examples/widgets/tools/undo/commands.h | 14 +- examples/widgets/tools/undo/document.cpp | 14 +- examples/widgets/tools/undo/document.h | 14 +- examples/widgets/tools/undo/main.cpp | 14 +- examples/widgets/tools/undo/mainwindow.cpp | 14 +- examples/widgets/tools/undo/mainwindow.h | 14 +- .../widgets/tools/undoframework/commands.cpp | 10 +- .../widgets/tools/undoframework/commands.h | 10 +- .../tools/undoframework/diagramitem.cpp | 10 +- .../widgets/tools/undoframework/diagramitem.h | 10 +- .../tools/undoframework/diagramscene.cpp | 10 +- .../tools/undoframework/diagramscene.h | 10 +- examples/widgets/tools/undoframework/main.cpp | 10 +- .../tools/undoframework/mainwindow.cpp | 10 +- .../widgets/tools/undoframework/mainwindow.h | 10 +- .../addressbook/part1/addressbook.cpp | 10 +- .../tutorials/addressbook/part1/addressbook.h | 10 +- .../tutorials/addressbook/part1/main.cpp | 10 +- .../addressbook/part2/addressbook.cpp | 10 +- .../tutorials/addressbook/part2/addressbook.h | 10 +- .../tutorials/addressbook/part2/main.cpp | 10 +- .../addressbook/part3/addressbook.cpp | 10 +- .../tutorials/addressbook/part3/addressbook.h | 10 +- .../tutorials/addressbook/part3/main.cpp | 10 +- .../addressbook/part4/addressbook.cpp | 10 +- .../tutorials/addressbook/part4/addressbook.h | 10 +- .../tutorials/addressbook/part4/main.cpp | 10 +- .../addressbook/part5/addressbook.cpp | 10 +- .../tutorials/addressbook/part5/addressbook.h | 10 +- .../addressbook/part5/finddialog.cpp | 10 +- .../tutorials/addressbook/part5/finddialog.h | 10 +- .../tutorials/addressbook/part5/main.cpp | 10 +- .../addressbook/part6/addressbook.cpp | 10 +- .../tutorials/addressbook/part6/addressbook.h | 10 +- .../addressbook/part6/finddialog.cpp | 10 +- .../tutorials/addressbook/part6/finddialog.h | 10 +- .../tutorials/addressbook/part6/main.cpp | 10 +- .../addressbook/part7/addressbook.cpp | 10 +- .../tutorials/addressbook/part7/addressbook.h | 10 +- .../addressbook/part7/finddialog.cpp | 10 +- .../tutorials/addressbook/part7/finddialog.h | 10 +- .../tutorials/addressbook/part7/main.cpp | 10 +- .../gettingStarted/gsQt/part1/main.cpp | 10 +- .../gettingStarted/gsQt/part2/main.cpp | 10 +- .../gettingStarted/gsQt/part3/main.cpp | 10 +- .../gettingStarted/gsQt/part4/main.cpp | 10 +- .../gettingStarted/gsQt/part5/main.cpp | 10 +- .../tutorials/modelview/1_readonly/main.cpp | 10 +- .../modelview/1_readonly/mymodel.cpp | 10 +- .../tutorials/modelview/1_readonly/mymodel.h | 10 +- .../tutorials/modelview/2_formatting/main.cpp | 10 +- .../modelview/2_formatting/mymodel.cpp | 10 +- .../modelview/2_formatting/mymodel.h | 10 +- .../modelview/3_changingmodel/main.cpp | 10 +- .../modelview/3_changingmodel/mymodel.cpp | 10 +- .../modelview/3_changingmodel/mymodel.h | 10 +- .../tutorials/modelview/4_headers/main.cpp | 10 +- .../tutorials/modelview/4_headers/mymodel.cpp | 10 +- .../tutorials/modelview/4_headers/mymodel.h | 10 +- .../tutorials/modelview/5_edit/main.cpp | 10 +- .../tutorials/modelview/5_edit/mainwindow.cpp | 10 +- .../tutorials/modelview/5_edit/mainwindow.h | 10 +- .../tutorials/modelview/5_edit/mymodel.cpp | 10 +- .../tutorials/modelview/5_edit/mymodel.h | 10 +- .../tutorials/modelview/6_treeview/main.cpp | 10 +- .../modelview/6_treeview/mainwindow.cpp | 10 +- .../modelview/6_treeview/mainwindow.h | 10 +- .../tutorials/modelview/7_selections/main.cpp | 10 +- .../modelview/7_selections/mainwindow.cpp | 10 +- .../modelview/7_selections/mainwindow.h | 10 +- .../tutorials/widgets/childwidget/main.cpp | 10 +- .../tutorials/widgets/nestedlayouts/main.cpp | 10 +- .../tutorials/widgets/toplevel/main.cpp | 10 +- .../tutorials/widgets/windowlayout/main.cpp | 10 +- .../widgets/analogclock/analogclock.cpp | 10 +- .../widgets/widgets/analogclock/analogclock.h | 10 +- examples/widgets/widgets/analogclock/main.cpp | 10 +- .../widgets/widgets/calculator/button.cpp | 10 +- examples/widgets/widgets/calculator/button.h | 10 +- .../widgets/widgets/calculator/calculator.cpp | 10 +- .../widgets/widgets/calculator/calculator.h | 10 +- examples/widgets/widgets/calculator/main.cpp | 10 +- .../widgets/widgets/calendarwidget/main.cpp | 10 +- .../widgets/widgets/calendarwidget/window.cpp | 10 +- .../widgets/widgets/calendarwidget/window.h | 10 +- .../widgets/charactermap/characterwidget.cpp | 10 +- .../widgets/charactermap/characterwidget.h | 10 +- .../widgets/widgets/charactermap/main.cpp | 10 +- .../widgets/charactermap/mainwindow.cpp | 10 +- .../widgets/widgets/charactermap/mainwindow.h | 10 +- .../widgets/widgets/codeeditor/codeeditor.cpp | 10 +- .../widgets/widgets/codeeditor/codeeditor.h | 10 +- examples/widgets/widgets/codeeditor/main.cpp | 10 +- .../widgets/digitalclock/digitalclock.cpp | 10 +- .../widgets/digitalclock/digitalclock.h | 10 +- .../widgets/widgets/digitalclock/main.cpp | 10 +- .../widgets/elidedlabel/elidedlabel.cpp | 10 +- .../widgets/widgets/elidedlabel/elidedlabel.h | 10 +- examples/widgets/widgets/elidedlabel/main.cpp | 10 +- .../widgets/elidedlabel/testwidget.cpp | 10 +- .../widgets/widgets/elidedlabel/testwidget.h | 10 +- examples/widgets/widgets/groupbox/main.cpp | 10 +- examples/widgets/widgets/groupbox/window.cpp | 10 +- examples/widgets/widgets/groupbox/window.h | 10 +- .../widgets/widgets/icons/iconpreviewarea.cpp | 10 +- .../widgets/widgets/icons/iconpreviewarea.h | 10 +- .../widgets/widgets/icons/iconsizespinbox.cpp | 10 +- .../widgets/widgets/icons/iconsizespinbox.h | 10 +- .../widgets/widgets/icons/imagedelegate.cpp | 10 +- .../widgets/widgets/icons/imagedelegate.h | 10 +- examples/widgets/widgets/icons/main.cpp | 10 +- examples/widgets/widgets/icons/mainwindow.cpp | 10 +- examples/widgets/widgets/icons/mainwindow.h | 10 +- .../widgets/imageviewer/imageviewer.cpp | 10 +- .../widgets/widgets/imageviewer/imageviewer.h | 10 +- examples/widgets/widgets/imageviewer/main.cpp | 10 +- examples/widgets/widgets/lineedits/main.cpp | 10 +- examples/widgets/widgets/lineedits/window.cpp | 10 +- examples/widgets/widgets/lineedits/window.h | 10 +- .../widgets/mousebuttons/buttontester.cpp | 10 +- .../widgets/mousebuttons/buttontester.h | 10 +- .../widgets/widgets/mousebuttons/main.cpp | 10 +- examples/widgets/widgets/movie/main.cpp | 10 +- .../widgets/widgets/movie/movieplayer.cpp | 10 +- examples/widgets/widgets/movie/movieplayer.h | 10 +- examples/widgets/widgets/scribble/main.cpp | 10 +- .../widgets/widgets/scribble/mainwindow.cpp | 10 +- .../widgets/widgets/scribble/mainwindow.h | 10 +- .../widgets/widgets/scribble/scribblearea.cpp | 10 +- .../widgets/widgets/scribble/scribblearea.h | 10 +- examples/widgets/widgets/shapedclock/main.cpp | 10 +- .../widgets/shapedclock/shapedclock.cpp | 10 +- .../widgets/widgets/shapedclock/shapedclock.h | 10 +- examples/widgets/widgets/sliders/main.cpp | 10 +- .../widgets/widgets/sliders/slidersgroup.cpp | 10 +- .../widgets/widgets/sliders/slidersgroup.h | 10 +- examples/widgets/widgets/sliders/window.cpp | 10 +- examples/widgets/widgets/sliders/window.h | 10 +- examples/widgets/widgets/spinboxes/main.cpp | 10 +- examples/widgets/widgets/spinboxes/window.cpp | 10 +- examples/widgets/widgets/spinboxes/window.h | 10 +- examples/widgets/widgets/styles/main.cpp | 10 +- .../widgets/styles/norwegianwoodstyle.cpp | 10 +- .../widgets/styles/norwegianwoodstyle.h | 10 +- .../widgets/widgets/styles/widgetgallery.cpp | 10 +- .../widgets/widgets/styles/widgetgallery.h | 10 +- examples/widgets/widgets/stylesheet/main.cpp | 10 +- .../widgets/widgets/stylesheet/mainwindow.cpp | 10 +- .../widgets/widgets/stylesheet/mainwindow.h | 10 +- .../widgets/stylesheet/stylesheeteditor.cpp | 10 +- .../widgets/stylesheet/stylesheeteditor.h | 10 +- examples/widgets/widgets/tablet/main.cpp | 10 +- .../widgets/widgets/tablet/mainwindow.cpp | 10 +- examples/widgets/widgets/tablet/mainwindow.h | 10 +- .../widgets/tablet/tabletapplication.cpp | 10 +- .../widgets/tablet/tabletapplication.h | 10 +- .../widgets/widgets/tablet/tabletcanvas.cpp | 10 +- .../widgets/widgets/tablet/tabletcanvas.h | 10 +- examples/widgets/widgets/tetrix/main.cpp | 10 +- .../widgets/widgets/tetrix/tetrixboard.cpp | 10 +- examples/widgets/widgets/tetrix/tetrixboard.h | 10 +- .../widgets/widgets/tetrix/tetrixpiece.cpp | 10 +- examples/widgets/widgets/tetrix/tetrixpiece.h | 10 +- .../widgets/widgets/tetrix/tetrixwindow.cpp | 10 +- .../widgets/widgets/tetrix/tetrixwindow.h | 10 +- examples/widgets/widgets/tooltips/main.cpp | 10 +- .../widgets/widgets/tooltips/shapeitem.cpp | 10 +- examples/widgets/widgets/tooltips/shapeitem.h | 10 +- .../widgets/widgets/tooltips/sortingbox.cpp | 10 +- .../widgets/widgets/tooltips/sortingbox.h | 10 +- .../widgets/widgets/validators/ledwidget.cpp | 10 +- .../widgets/widgets/validators/ledwidget.h | 10 +- .../widgets/validators/localeselector.cpp | 10 +- .../widgets/validators/localeselector.h | 10 +- examples/widgets/widgets/validators/main.cpp | 10 +- examples/widgets/widgets/wiggly/dialog.cpp | 10 +- examples/widgets/widgets/wiggly/dialog.h | 10 +- examples/widgets/widgets/wiggly/main.cpp | 10 +- .../widgets/widgets/wiggly/wigglywidget.cpp | 10 +- .../widgets/widgets/wiggly/wigglywidget.h | 10 +- .../widgets/windowflags/controllerwindow.cpp | 10 +- .../widgets/windowflags/controllerwindow.h | 10 +- examples/widgets/widgets/windowflags/main.cpp | 10 +- .../widgets/windowflags/previewwindow.cpp | 10 +- .../widgets/windowflags/previewwindow.h | 10 +- .../windowcontainer/windowcontainer.cpp | 10 +- .../dombookmarks/doc/src/dombookmarks.qdoc | 12 +- examples/xml/dombookmarks/main.cpp | 10 +- examples/xml/dombookmarks/mainwindow.cpp | 10 +- examples/xml/dombookmarks/mainwindow.h | 10 +- examples/xml/dombookmarks/xbeltree.cpp | 10 +- examples/xml/dombookmarks/xbeltree.h | 10 +- examples/xml/htmlinfo/main.cpp | 10 +- examples/xml/htmlinfo/simpleexample.html | 4 +- examples/xml/rsslisting/main.cpp | 10 +- examples/xml/rsslisting/rsslisting.cpp | 12 +- examples/xml/rsslisting/rsslisting.h | 10 +- .../saxbookmarks/doc/src/saxbookmarks.qdoc | 12 +- examples/xml/saxbookmarks/main.cpp | 10 +- examples/xml/saxbookmarks/mainwindow.cpp | 10 +- examples/xml/saxbookmarks/mainwindow.h | 10 +- examples/xml/saxbookmarks/xbelgenerator.cpp | 10 +- examples/xml/saxbookmarks/xbelgenerator.h | 10 +- examples/xml/saxbookmarks/xbelhandler.cpp | 10 +- examples/xml/saxbookmarks/xbelhandler.h | 10 +- .../doc/src/qxmlstreambookmarks.qdoc | 12 +- examples/xml/streambookmarks/main.cpp | 10 +- examples/xml/streambookmarks/mainwindow.cpp | 10 +- examples/xml/streambookmarks/mainwindow.h | 10 +- examples/xml/streambookmarks/xbelreader.cpp | 10 +- examples/xml/streambookmarks/xbelreader.h | 10 +- examples/xml/streambookmarks/xbelwriter.cpp | 10 +- examples/xml/streambookmarks/xbelwriter.h | 10 +- .../xmlstreamlint/doc/src/xmlstreamlint.qdoc | 12 +- examples/xml/xmlstreamlint/main.cpp | 10 +- header.BSD | 10 +- header.FDL | 12 +- header.LGPL | 41 ---- header.LGPL-ONLY | 8 +- header.LGPL21 | 14 +- header.LGPL3 | 20 +- header.LGPL3-COMM | 28 +++ mkspecs/aix-g++-64/qplatformdefs.h | 14 +- mkspecs/aix-g++/qplatformdefs.h | 14 +- mkspecs/aix-xlc-64/qplatformdefs.h | 14 +- mkspecs/aix-xlc/qplatformdefs.h | 14 +- mkspecs/android-g++/qplatformdefs.h | 14 +- .../blackberry-armle-v7-qcc/qplatformdefs.h | 12 +- mkspecs/blackberry-x86-qcc/qplatformdefs.h | 12 +- mkspecs/common/aix/qplatformdefs.h | 14 +- mkspecs/common/android/qplatformdefs.h | 12 +- mkspecs/common/c89/qplatformdefs.h | 14 +- mkspecs/common/ios/GLES2/gl2.h | 14 +- mkspecs/common/mac/qplatformdefs.h | 14 +- mkspecs/common/nacl/qplatformdefs.h | 14 +- mkspecs/common/posix/qplatformdefs.h | 14 +- mkspecs/common/qnx/qplatformdefs.h | 12 +- mkspecs/common/wince/qplatformdefs.h | 14 +- mkspecs/common/winrt_winphone/qplatformdefs.h | 14 +- mkspecs/cygwin-g++/qplatformdefs.h | 14 +- mkspecs/darwin-g++/qplatformdefs.h | 14 +- .../qplatformdefs.h | 12 +- .../qplatformdefs.h | 12 +- .../linux-archos-gen8-g++/qplatformdefs.h | 14 +- .../qeglfshooks_8726m.cpp | 14 +- .../qplatformdefs.h | 14 +- .../qeglfshooks_hix5hd2.cpp | 14 +- .../qplatformdefs.h | 14 +- .../qplatformdefs.h | 14 +- .../linux-beagleboard-g++/qplatformdefs.h | 14 +- .../linux-imx53qsb-g++/qplatformdefs.h | 14 +- .../linux-imx6-g++/qeglfshooks_imx6.cpp | 14 +- .../devices/linux-imx6-g++/qplatformdefs.h | 14 +- .../qdirectfbeglhooks_bcm97425.cpp | 14 +- .../qplatformdefs.h | 14 +- .../linux-rasp-pi-g++/qeglfshooks_pi.cpp | 14 +- .../devices/linux-rasp-pi-g++/qplatformdefs.h | 14 +- .../qplatformdefs.h | 14 +- .../qplatformdefs.h | 14 +- .../linux-snowball-g++/qplatformdefs.h | 14 +- .../devices/linux-tegra2-g++/qplatformdefs.h | 14 +- .../data/headersclean/tst_headersclean.cpp.in | 38 ++- mkspecs/features/qt_targets.prf | 4 +- mkspecs/freebsd-g++/qplatformdefs.h | 14 +- mkspecs/freebsd-g++46/qplatformdefs.h | 14 +- mkspecs/freebsd-icc/qplatformdefs.h | 14 +- mkspecs/haiku-g++/qplatformdefs.h | 12 +- mkspecs/hpux-acc-64/qplatformdefs.h | 14 +- mkspecs/hpux-acc-o64/qplatformdefs.h | 14 +- mkspecs/hpux-acc/qplatformdefs.h | 14 +- mkspecs/hpux-g++-64/qplatformdefs.h | 14 +- mkspecs/hpux-g++/qplatformdefs.h | 14 +- mkspecs/hpuxi-acc-32/qplatformdefs.h | 14 +- mkspecs/hpuxi-acc-64/qplatformdefs.h | 14 +- mkspecs/hpuxi-g++-64/qplatformdefs.h | 14 +- mkspecs/hurd-g++/qplatformdefs.h | 14 +- mkspecs/irix-cc-64/qplatformdefs.h | 14 +- mkspecs/irix-cc/qplatformdefs.h | 14 +- mkspecs/irix-g++-64/qplatformdefs.h | 14 +- mkspecs/irix-g++/qplatformdefs.h | 14 +- mkspecs/linux-arm-gnueabi-g++/qplatformdefs.h | 14 +- mkspecs/linux-clang-libc++/qplatformdefs.h | 14 +- mkspecs/linux-clang/qplatformdefs.h | 14 +- mkspecs/linux-cxx/qplatformdefs.h | 14 +- mkspecs/linux-g++-32/qplatformdefs.h | 14 +- mkspecs/linux-g++-64/qplatformdefs.h | 14 +- mkspecs/linux-g++/qplatformdefs.h | 14 +- mkspecs/linux-icc-32/qplatformdefs.h | 14 +- mkspecs/linux-icc-64/qplatformdefs.h | 14 +- mkspecs/linux-icc/qplatformdefs.h | 14 +- mkspecs/linux-kcc/qplatformdefs.h | 14 +- mkspecs/linux-llvm/qplatformdefs.h | 14 +- mkspecs/linux-lsb-g++/qplatformdefs.h | 14 +- mkspecs/linux-pgcc/qplatformdefs.h | 14 +- mkspecs/lynxos-g++/qplatformdefs.h | 14 +- mkspecs/macx-clang-32/qplatformdefs.h | 14 +- mkspecs/macx-clang/qplatformdefs.h | 14 +- mkspecs/macx-g++-32/qplatformdefs.h | 14 +- mkspecs/macx-g++/qplatformdefs.h | 14 +- mkspecs/macx-g++40/qplatformdefs.h | 14 +- mkspecs/macx-g++42/qplatformdefs.h | 14 +- mkspecs/macx-icc/qplatformdefs.h | 14 +- mkspecs/macx-ios-clang/qplatformdefs.h | 14 +- mkspecs/macx-ios-clang/rename_main.sh | 36 ++- mkspecs/macx-llvm/qplatformdefs.h | 14 +- mkspecs/macx-xcode/qplatformdefs.h | 14 +- mkspecs/netbsd-g++/qplatformdefs.h | 14 +- mkspecs/openbsd-g++/qplatformdefs.h | 14 +- mkspecs/qnx-armle-v7-qcc/qplatformdefs.h | 12 +- mkspecs/qnx-x86-qcc/qplatformdefs.h | 12 +- mkspecs/sco-cc/qplatformdefs.h | 14 +- mkspecs/sco-g++/qplatformdefs.h | 14 +- mkspecs/solaris-cc-64-stlport/qplatformdefs.h | 14 +- mkspecs/solaris-cc-64/qplatformdefs.h | 14 +- mkspecs/solaris-cc-stlport/qplatformdefs.h | 14 +- mkspecs/solaris-cc/qplatformdefs.h | 14 +- mkspecs/solaris-g++-64/qplatformdefs.h | 14 +- mkspecs/solaris-g++/qplatformdefs.h | 14 +- mkspecs/tru64-cxx/qplatformdefs.h | 14 +- mkspecs/tru64-g++/qplatformdefs.h | 14 +- mkspecs/unixware-cc/qplatformdefs.h | 14 +- mkspecs/unixware-g++/qplatformdefs.h | 14 +- .../qeglfshooks_surfaceflinger.cpp | 14 +- .../unsupported/android-g++/qplatformdefs.h | 14 +- .../unsupported/freebsd-clang/qplatformdefs.h | 14 +- .../unsupported/linux-armcc/qplatformdefs.h | 14 +- .../linux-host-g++/qplatformdefs.h | 14 +- .../linux-scratchbox2-g++/qplatformdefs.h | 14 +- mkspecs/unsupported/nacl-g++/qplatformdefs.h | 14 +- .../unsupported/nacl64-g++/qplatformdefs.h | 14 +- .../unsupported/qnx-X11-g++/qplatformdefs.h | 14 +- .../vxworks-ppc-dcc/qplatformdefs.h | 14 +- .../vxworks-ppc-g++/qplatformdefs.h | 14 +- .../vxworks-simpentium-dcc/qplatformdefs.h | 14 +- .../vxworks-simpentium-g++/qplatformdefs.h | 14 +- mkspecs/win32-g++/qplatformdefs.h | 14 +- mkspecs/win32-icc/qplatformdefs.h | 14 +- mkspecs/win32-msvc2005/qplatformdefs.h | 14 +- mkspecs/win32-msvc2008/qplatformdefs.h | 14 +- mkspecs/win32-msvc2010/qplatformdefs.h | 14 +- mkspecs/win32-msvc2012/qplatformdefs.h | 14 +- mkspecs/win32-msvc2013/qplatformdefs.h | 14 +- mkspecs/win32-msvc2015/qplatformdefs.h | 14 +- .../qplatformdefs.h | 14 +- .../qplatformdefs.h | 14 +- .../qplatformdefs.h | 14 +- .../qplatformdefs.h | 14 +- mkspecs/winphone-arm-msvc2013/qplatformdefs.h | 14 +- mkspecs/winphone-x86-msvc2013/qplatformdefs.h | 14 +- mkspecs/winrt-arm-msvc2013/qplatformdefs.h | 14 +- mkspecs/winrt-x64-msvc2013/qplatformdefs.h | 14 +- mkspecs/winrt-x86-msvc2013/qplatformdefs.h | 14 +- qmake/cachekeys.h | 14 +- .../snippets/code/doc_src_qmake-manual.cpp | 10 +- .../snippets/code/doc_src_qmake-manual.pro | 10 +- qmake/doc/snippets/qmake/delegate.h | 10 +- qmake/doc/snippets/qmake/main.cpp | 10 +- qmake/doc/snippets/qmake/model.cpp | 10 +- qmake/doc/snippets/qmake/model.h | 10 +- qmake/doc/snippets/qmake/paintwidget_mac.cpp | 10 +- qmake/doc/snippets/qmake/paintwidget_unix.cpp | 10 +- qmake/doc/snippets/qmake/paintwidget_win.cpp | 10 +- qmake/doc/snippets/qmake/precompile-stable.h | 10 +- qmake/doc/snippets/qmake/view.h | 10 +- qmake/doc/src/qmake-manual.qdoc | 12 +- qmake/generators/mac/pbuilder_pbx.cpp | 14 +- qmake/generators/mac/pbuilder_pbx.h | 14 +- qmake/generators/makefile.cpp | 14 +- qmake/generators/makefile.h | 14 +- qmake/generators/makefiledeps.cpp | 14 +- qmake/generators/makefiledeps.h | 14 +- qmake/generators/metamakefile.cpp | 14 +- qmake/generators/metamakefile.h | 14 +- qmake/generators/projectgenerator.cpp | 14 +- qmake/generators/projectgenerator.h | 14 +- qmake/generators/unix/unixmake.cpp | 14 +- qmake/generators/unix/unixmake.h | 14 +- qmake/generators/unix/unixmake2.cpp | 14 +- qmake/generators/win32/cesdkhandler.cpp | 14 +- qmake/generators/win32/cesdkhandler.h | 14 +- qmake/generators/win32/mingw_make.cpp | 14 +- qmake/generators/win32/mingw_make.h | 14 +- .../generators/win32/msbuild_objectmodel.cpp | 14 +- qmake/generators/win32/msbuild_objectmodel.h | 14 +- qmake/generators/win32/msvc_nmake.cpp | 14 +- qmake/generators/win32/msvc_nmake.h | 14 +- qmake/generators/win32/msvc_objectmodel.cpp | 14 +- qmake/generators/win32/msvc_objectmodel.h | 14 +- qmake/generators/win32/msvc_vcproj.cpp | 14 +- qmake/generators/win32/msvc_vcproj.h | 14 +- qmake/generators/win32/msvc_vcxproj.cpp | 14 +- qmake/generators/win32/msvc_vcxproj.h | 14 +- qmake/generators/win32/winmakefile.cpp | 14 +- qmake/generators/win32/winmakefile.h | 14 +- qmake/generators/xmloutput.cpp | 14 +- qmake/generators/xmloutput.h | 14 +- qmake/library/ioutils.cpp | 14 +- qmake/library/ioutils.h | 14 +- qmake/library/proitems.cpp | 14 +- qmake/library/proitems.h | 14 +- qmake/library/qmake_global.h | 14 +- qmake/library/qmakebuiltins.cpp | 14 +- qmake/library/qmakeevaluator.cpp | 14 +- qmake/library/qmakeevaluator.h | 14 +- qmake/library/qmakeevaluator_p.h | 14 +- qmake/library/qmakeglobals.cpp | 14 +- qmake/library/qmakeglobals.h | 14 +- qmake/library/qmakeparser.cpp | 14 +- qmake/library/qmakeparser.h | 14 +- qmake/library/qmakevfs.cpp | 14 +- qmake/library/qmakevfs.h | 14 +- qmake/main.cpp | 14 +- qmake/meta.cpp | 14 +- qmake/meta.h | 14 +- qmake/option.cpp | 16 +- qmake/option.h | 14 +- qmake/project.cpp | 14 +- qmake/project.h | 14 +- qmake/property.cpp | 14 +- qmake/property.h | 14 +- qmake/qmake_pch.h | 14 +- src/3rdparty/angle/CONTRIBUTORS | 2 +- src/3rdparty/easing/easing.cpp | 2 +- .../freetype/src/tools/ftrandom/ftrandom.c | 2 +- src/3rdparty/harfbuzz/src/harfbuzz-arabic.c | 2 +- src/3rdparty/harfbuzz/src/harfbuzz-external.h | 2 +- src/3rdparty/harfbuzz/src/harfbuzz-global.h | 2 +- src/3rdparty/harfbuzz/src/harfbuzz-greek.c | 2 +- src/3rdparty/harfbuzz/src/harfbuzz-hangul.c | 2 +- src/3rdparty/harfbuzz/src/harfbuzz-hebrew.c | 2 +- src/3rdparty/harfbuzz/src/harfbuzz-impl.c | 2 +- src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp | 2 +- src/3rdparty/harfbuzz/src/harfbuzz-khmer.c | 2 +- src/3rdparty/harfbuzz/src/harfbuzz-myanmar.c | 2 +- .../harfbuzz/src/harfbuzz-shaper-all.cpp | 2 +- .../harfbuzz/src/harfbuzz-shaper-private.h | 2 +- src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp | 2 +- src/3rdparty/harfbuzz/src/harfbuzz-shaper.h | 2 +- src/3rdparty/harfbuzz/src/harfbuzz-stream.c | 2 +- src/3rdparty/harfbuzz/src/harfbuzz-stream.h | 2 +- src/3rdparty/harfbuzz/src/harfbuzz-thai.c | 2 +- src/3rdparty/harfbuzz/src/harfbuzz-tibetan.c | 2 +- .../harfbuzz/tests/shaping/harfbuzz-qt.cpp | 2 +- src/3rdparty/harfbuzz/tests/shaping/main.cpp | 2 +- src/3rdparty/pcre/import_from_pcre_tarball.sh | 34 ++- src/3rdparty/sha1/sha1.cpp | 14 +- .../QtAccessibilityDelegate.java | 36 ++- .../accessibility/QtNativeAccessibility.java | 38 ++- .../qtproject/qt5/android/ExtractStyle.java | 34 ++- .../qt5/android/QtActivityDelegate.java | 36 ++- .../org/qtproject/qt5/android/QtEditText.java | 36 ++- .../qt5/android/QtInputConnection.java | 36 ++- .../org/qtproject/qt5/android/QtLayout.java | 36 ++- .../qt5/android/QtMessageDialogHelper.java | 34 ++- .../org/qtproject/qt5/android/QtNative.java | 36 ++- .../qt5/android/QtNativeLibrariesDir.java | 38 ++- .../qtproject/qt5/android/QtPopupMenu.java | 34 ++- .../qtproject/qt5/android/QtPopupMenu14.java | 34 ++- .../org/qtproject/qt5/android/QtSurface.java | 36 ++- .../kde/necessitas/ministro/IMinistro.aidl | 8 +- .../ministro/IMinistroCallback.aidl | 8 +- .../qt5/android/bindings/QtActivity.java | 8 +- .../qt5/android/bindings/QtApplication.java | 8 +- .../src_concurrent_qtconcurrentfilter.cpp | 10 +- .../code/src_concurrent_qtconcurrentmap.cpp | 10 +- .../code/src_concurrent_qtconcurrentrun.cpp | 10 +- .../doc/src/qtconcurrent-index.qdoc | 12 +- .../doc/src/qtconcurrent-module.qdoc | 12 +- src/concurrent/qtconcurrent_global.h | 14 +- src/concurrent/qtconcurrentcompilertest.h | 14 +- src/concurrent/qtconcurrentexception.h | 14 +- src/concurrent/qtconcurrentfilter.cpp | 14 +- src/concurrent/qtconcurrentfilter.h | 14 +- src/concurrent/qtconcurrentfilterkernel.h | 14 +- src/concurrent/qtconcurrentfunctionwrappers.h | 14 +- src/concurrent/qtconcurrentiteratekernel.cpp | 14 +- src/concurrent/qtconcurrentiteratekernel.h | 14 +- src/concurrent/qtconcurrentmap.cpp | 14 +- src/concurrent/qtconcurrentmap.h | 14 +- src/concurrent/qtconcurrentmapkernel.h | 14 +- src/concurrent/qtconcurrentmedian.h | 14 +- src/concurrent/qtconcurrentreducekernel.h | 14 +- src/concurrent/qtconcurrentrun.cpp | 14 +- src/concurrent/qtconcurrentrun.h | 14 +- src/concurrent/qtconcurrentrunbase.h | 14 +- .../qtconcurrentstoredfunctioncall.h | 14 +- src/concurrent/qtconcurrentthreadengine.cpp | 14 +- src/concurrent/qtconcurrentthreadengine.h | 14 +- src/corelib/Qt5CoreMacros.cmake | 2 +- src/corelib/animation/qabstractanimation.cpp | 14 +- src/corelib/animation/qabstractanimation.h | 14 +- src/corelib/animation/qabstractanimation_p.h | 14 +- src/corelib/animation/qanimationgroup.cpp | 14 +- src/corelib/animation/qanimationgroup.h | 14 +- src/corelib/animation/qanimationgroup_p.h | 14 +- .../animation/qparallelanimationgroup.cpp | 14 +- .../animation/qparallelanimationgroup.h | 14 +- .../animation/qparallelanimationgroup_p.h | 14 +- src/corelib/animation/qpauseanimation.cpp | 14 +- src/corelib/animation/qpauseanimation.h | 14 +- src/corelib/animation/qpropertyanimation.cpp | 14 +- src/corelib/animation/qpropertyanimation.h | 14 +- src/corelib/animation/qpropertyanimation_p.h | 14 +- .../animation/qsequentialanimationgroup.cpp | 14 +- .../animation/qsequentialanimationgroup.h | 14 +- .../animation/qsequentialanimationgroup_p.h | 14 +- src/corelib/animation/qvariantanimation.cpp | 14 +- src/corelib/animation/qvariantanimation.h | 14 +- src/corelib/animation/qvariantanimation_p.h | 14 +- src/corelib/arch/qatomic_armv5.h | 14 +- src/corelib/arch/qatomic_armv6.h | 14 +- src/corelib/arch/qatomic_armv7.h | 14 +- src/corelib/arch/qatomic_bootstrap.h | 14 +- src/corelib/arch/qatomic_cxx11.h | 12 +- src/corelib/arch/qatomic_gcc.h | 12 +- src/corelib/arch/qatomic_ia64.h | 14 +- src/corelib/arch/qatomic_mips.h | 14 +- src/corelib/arch/qatomic_msvc.h | 14 +- src/corelib/arch/qatomic_unix.cpp | 14 +- src/corelib/arch/qatomic_unix.h | 14 +- src/corelib/arch/qatomic_x86.h | 14 +- src/corelib/arch/sparc/qatomic32.s | 36 ++- src/corelib/arch/sparc/qatomic64.s | 36 ++- src/corelib/arch/sparc/qatomic_sparc.cpp | 14 +- src/corelib/codecs/codecs.qdoc | 12 +- src/corelib/codecs/cp949codetbl_p.h | 14 +- src/corelib/codecs/qbig5codec.cpp | 14 +- src/corelib/codecs/qbig5codec_p.h | 14 +- src/corelib/codecs/qeucjpcodec.cpp | 14 +- src/corelib/codecs/qeucjpcodec_p.h | 14 +- src/corelib/codecs/qeuckrcodec.cpp | 14 +- src/corelib/codecs/qeuckrcodec_p.h | 14 +- src/corelib/codecs/qgb18030codec.cpp | 14 +- src/corelib/codecs/qgb18030codec_p.h | 14 +- src/corelib/codecs/qiconvcodec.cpp | 14 +- src/corelib/codecs/qiconvcodec_p.h | 14 +- src/corelib/codecs/qicucodec.cpp | 14 +- src/corelib/codecs/qicucodec_p.h | 14 +- src/corelib/codecs/qisciicodec.cpp | 14 +- src/corelib/codecs/qisciicodec_p.h | 14 +- src/corelib/codecs/qjiscodec.cpp | 14 +- src/corelib/codecs/qjiscodec_p.h | 14 +- src/corelib/codecs/qjpunicode.cpp | 14 +- src/corelib/codecs/qjpunicode_p.h | 14 +- src/corelib/codecs/qlatincodec.cpp | 14 +- src/corelib/codecs/qlatincodec_p.h | 14 +- src/corelib/codecs/qsimplecodec.cpp | 14 +- src/corelib/codecs/qsimplecodec_p.h | 14 +- src/corelib/codecs/qsjiscodec.cpp | 14 +- src/corelib/codecs/qsjiscodec_p.h | 14 +- src/corelib/codecs/qtextcodec.cpp | 14 +- src/corelib/codecs/qtextcodec.h | 14 +- src/corelib/codecs/qtextcodec_p.h | 14 +- src/corelib/codecs/qtsciicodec.cpp | 14 +- src/corelib/codecs/qtsciicodec_p.h | 14 +- src/corelib/codecs/qutfcodec.cpp | 14 +- src/corelib/codecs/qutfcodec_p.h | 14 +- src/corelib/codecs/qwindowscodec.cpp | 14 +- src/corelib/codecs/qwindowscodec_p.h | 14 +- src/corelib/doc/snippets/buffer/buffer.cpp | 10 +- .../doc/snippets/code/doc_src_containers.cpp | 10 +- .../doc/snippets/code/doc_src_groups.cpp | 10 +- .../doc/snippets/code/doc_src_objecttrees.cpp | 10 +- .../doc/snippets/code/doc_src_properties.cpp | 10 +- .../doc/snippets/code/doc_src_qalgorithms.cpp | 10 +- .../doc/snippets/code/doc_src_qcache.cpp | 10 +- .../doc/snippets/code/doc_src_qiterator.cpp | 10 +- .../doc/snippets/code/doc_src_qnamespace.cpp | 10 +- .../doc/snippets/code/doc_src_qnamespace.qdoc | 10 +- .../doc/snippets/code/doc_src_qpair.cpp | 10 +- .../doc/snippets/code/doc_src_qplugin.cpp | 10 +- .../doc/snippets/code/doc_src_qset.cpp | 10 +- .../doc/snippets/code/doc_src_qtcore.cpp | 10 +- .../snippets/code/doc_src_qvarlengtharray.cpp | 10 +- .../doc/snippets/code/doc_src_resources.cpp | 10 +- .../doc/snippets/code/doc_src_resources.qdoc | 10 +- .../doc/snippets/code/qlogging/qlogging.cpp | 10 +- .../code/src_corelib_codecs_qtextcodec.cpp | 10 +- .../src_corelib_concurrent_qthreadpool.cpp | 10 +- .../code/src_corelib_global_qglobal.cpp | 10 +- .../src_corelib_io_qabstractfileengine.cpp | 10 +- .../code/src_corelib_io_qdatastream.cpp | 10 +- .../doc/snippets/code/src_corelib_io_qdir.cpp | 10 +- .../code/src_corelib_io_qdiriterator.cpp | 10 +- .../snippets/code/src_corelib_io_qfile.cpp | 10 +- .../code/src_corelib_io_qfileinfo.cpp | 10 +- .../code/src_corelib_io_qiodevice.cpp | 10 +- .../snippets/code/src_corelib_io_qprocess.cpp | 10 +- .../code/src_corelib_io_qsettings.cpp | 10 +- .../code/src_corelib_io_qstorageinfo.cpp | 12 +- .../code/src_corelib_io_qtemporarydir.cpp | 10 +- .../code/src_corelib_io_qtemporaryfile.cpp | 10 +- .../code/src_corelib_io_qtextstream.cpp | 10 +- .../doc/snippets/code/src_corelib_io_qurl.cpp | 10 +- .../src_corelib_kernel_qabstractitemmodel.cpp | 10 +- ...elib_kernel_qabstractnativeeventfilter.cpp | 10 +- .../src_corelib_kernel_qcoreapplication.cpp | 10 +- .../code/src_corelib_kernel_qmath.cpp | 8 +- .../code/src_corelib_kernel_qmetaobject.cpp | 10 +- .../code/src_corelib_kernel_qmetatype.cpp | 10 +- .../code/src_corelib_kernel_qmimedata.cpp | 10 +- .../code/src_corelib_kernel_qobject.cpp | 10 +- .../src_corelib_kernel_qsystemsemaphore.cpp | 10 +- .../code/src_corelib_kernel_qtimer.cpp | 10 +- .../code/src_corelib_kernel_qvariant.cpp | 10 +- .../src_corelib_mimetype_qmimedatabase.cpp | 10 +- .../code/src_corelib_plugin_qlibrary.cpp | 10 +- .../code/src_corelib_plugin_quuid.cpp | 10 +- ...src_corelib_statemachine_qstatemachine.cpp | 10 +- .../code/src_corelib_thread_qatomic.cpp | 10 +- .../code/src_corelib_thread_qexception.cpp | 10 +- .../code/src_corelib_thread_qfuture.cpp | 10 +- ...src_corelib_thread_qfuturesynchronizer.cpp | 10 +- .../src_corelib_thread_qfuturewatcher.cpp | 10 +- .../code/src_corelib_thread_qmutex.cpp | 10 +- .../code/src_corelib_thread_qmutexpool.cpp | 10 +- .../src_corelib_thread_qreadwritelock.cpp | 10 +- .../code/src_corelib_thread_qsemaphore.cpp | 10 +- .../code/src_corelib_thread_qthread.cpp | 8 +- ...src_corelib_thread_qwaitcondition_unix.cpp | 10 +- .../code/src_corelib_tools_qbitarray.cpp | 10 +- .../code/src_corelib_tools_qbytearray.cpp | 18 +- .../src_corelib_tools_qcommandlineoption.cpp | 8 +- .../src_corelib_tools_qcommandlineparser.cpp | 8 +- ..._corelib_tools_qcommandlineparser_main.cpp | 8 +- .../code/src_corelib_tools_qdatetime.cpp | 10 +- .../code/src_corelib_tools_qeasingcurve.cpp | 10 +- .../snippets/code/src_corelib_tools_qhash.cpp | 10 +- .../code/src_corelib_tools_qlinkedlist.cpp | 10 +- .../code/src_corelib_tools_qlistdata.cpp | 10 +- .../code/src_corelib_tools_qlocale.cpp | 10 +- .../snippets/code/src_corelib_tools_qmap.cpp | 10 +- .../code/src_corelib_tools_qpoint.cpp | 10 +- .../code/src_corelib_tools_qqueue.cpp | 10 +- .../snippets/code/src_corelib_tools_qrect.cpp | 10 +- .../code/src_corelib_tools_qregexp.cpp | 12 +- .../src_corelib_tools_qregularexpression.cpp | 8 +- .../code/src_corelib_tools_qscopedpointer.cpp | 10 +- .../snippets/code/src_corelib_tools_qsize.cpp | 10 +- .../code/src_corelib_tools_qstring.cpp | 10 +- .../src_corelib_tools_qstringiterator.cpp | 8 +- .../code/src_corelib_tools_qtimeline.cpp | 10 +- .../code/src_corelib_tools_qvector.cpp | 10 +- .../code/src_corelib_xml_qxmlstream.cpp | 10 +- .../code/src_gui_dialogs_qmessagebox.cpp | 10 +- .../src_gui_itemviews_qidentityproxymodel.cpp | 8 +- .../src_gui_itemviews_qitemselectionmodel.cpp | 10 +- .../snippets/eventfilters/filterobject.cpp | 10 +- .../doc/snippets/eventfilters/filterobject.h | 10 +- .../doc/snippets/eventfilters/main.cpp | 10 +- src/corelib/doc/snippets/events/events.cpp | 10 +- src/corelib/doc/snippets/file/file.cpp | 10 +- src/corelib/doc/snippets/fileinfo/main.cpp | 10 +- src/corelib/doc/snippets/hellotrmain.cpp | 10 +- src/corelib/doc/snippets/ntfsp.cpp | 10 +- src/corelib/doc/snippets/pointer/pointer.cpp | 10 +- src/corelib/doc/snippets/process/process.cpp | 10 +- .../doc/snippets/qbytearraylist/main.cpp | 36 ++- .../doc/snippets/qdebug/qdebugsnippet.cpp | 10 +- .../doc/snippets/qdir-listfiles/main.cpp | 10 +- .../doc/snippets/qdir-namefilters/main.cpp | 10 +- .../doc/snippets/qelapsedtimer/main.cpp | 10 +- .../doc/snippets/qloggingcategory/main.cpp | 10 +- .../qmessageauthenticationcode/main.cpp | 8 +- .../snippets/qmetaobject-invokable/main.cpp | 10 +- .../snippets/qmetaobject-invokable/window.cpp | 10 +- .../snippets/qmetaobject-invokable/window.h | 10 +- .../snippets/qmetaobject-revision/main.cpp | 8 +- .../snippets/qmetaobject-revision/window.cpp | 8 +- .../snippets/qmetaobject-revision/window.h | 8 +- .../snippets/qprocess-environment/main.cpp | 10 +- .../qprocess/qprocess-simpleexecution.cpp | 10 +- .../snippets/qsignalmapper/buttonwidget.cpp | 10 +- .../doc/snippets/qsignalmapper/buttonwidget.h | 10 +- .../qsortfilterproxymodel-details/main.cpp | 10 +- src/corelib/doc/snippets/qstack/main.cpp | 10 +- src/corelib/doc/snippets/qstring/main.cpp | 10 +- .../doc/snippets/qstring/stringbuilder.cpp | 10 +- src/corelib/doc/snippets/qstringlist/main.cpp | 10 +- .../doc/snippets/qstringlistmodel/main.cpp | 10 +- src/corelib/doc/snippets/qtcast/qtcast.cpp | 10 +- .../doc/snippets/qversionnumber/main.cpp | 10 +- .../doc/snippets/qxmlstreamwriter/main.cpp | 10 +- .../snippets/resource-system/mainwindow.cpp | 10 +- .../doc/snippets/settings/settings.cpp | 10 +- .../doc/snippets/sharedemployee/employee.h | 10 +- .../doc/snippets/sharedemployee/main.cpp | 10 +- .../doc/snippets/signalmapper/filereader.cpp | 10 +- .../doc/snippets/signalsandslots/lcdnumber.h | 10 +- .../signalsandslots/signalsandslots.cpp | 10 +- .../signalsandslots/signalsandslots.h | 10 +- .../doc/snippets/statemachine/eventtest.cpp | 10 +- .../doc/snippets/statemachine/main.cpp | 10 +- .../doc/snippets/statemachine/main2.cpp | 10 +- .../doc/snippets/statemachine/main3.cpp | 10 +- .../doc/snippets/statemachine/main4.cpp | 10 +- .../doc/snippets/statemachine/main5.cpp | 10 +- src/corelib/doc/snippets/streaming/main.cpp | 10 +- src/corelib/doc/snippets/threads/threads.cpp | 10 +- .../doc/snippets/timers/analogclock.cpp | 10 +- src/corelib/doc/snippets/timers/timers.cpp | 10 +- src/corelib/doc/src/animation.qdoc | 12 +- src/corelib/doc/src/containers.qdoc | 12 +- src/corelib/doc/src/custom-types.qdoc | 12 +- src/corelib/doc/src/datastreamformat.qdoc | 12 +- src/corelib/doc/src/eventsandfilters.qdoc | 12 +- src/corelib/doc/src/external-resources.qdoc | 12 +- src/corelib/doc/src/filestorage.qdoc | 12 +- src/corelib/doc/src/implicit-sharing.qdoc | 12 +- src/corelib/doc/src/io.qdoc | 12 +- src/corelib/doc/src/json.qdoc | 12 +- .../doc/src/objectmodel/metaobjects.qdoc | 12 +- src/corelib/doc/src/objectmodel/object.qdoc | 12 +- .../doc/src/objectmodel/objecttrees.qdoc | 12 +- .../doc/src/objectmodel/properties.qdoc | 12 +- .../doc/src/objectmodel/signalsandslots.qdoc | 12 +- src/corelib/doc/src/plugin-classes.qdoc | 12 +- src/corelib/doc/src/qtcore-index.qdoc | 12 +- src/corelib/doc/src/qtcore.qdoc | 12 +- src/corelib/doc/src/resource-system.qdoc | 12 +- src/corelib/doc/src/statemachine.qdoc | 12 +- src/corelib/doc/src/timers.qdoc | 12 +- src/corelib/global/archdetect.cpp | 14 +- src/corelib/global/qcompilerdetection.h | 14 +- src/corelib/global/qconfig-dist.h | 14 +- src/corelib/global/qconfig-large.h | 14 +- src/corelib/global/qconfig-medium.h | 14 +- src/corelib/global/qconfig-minimal.h | 14 +- src/corelib/global/qconfig-nacl.h | 14 +- src/corelib/global/qconfig-small.h | 14 +- src/corelib/global/qendian.h | 14 +- src/corelib/global/qendian.qdoc | 12 +- src/corelib/global/qflags.h | 14 +- src/corelib/global/qglobal.cpp | 14 +- src/corelib/global/qglobal.h | 14 +- src/corelib/global/qglobalstatic.cpp | 12 +- src/corelib/global/qglobalstatic.h | 12 +- src/corelib/global/qhooks.cpp | 12 +- src/corelib/global/qhooks_p.h | 12 +- src/corelib/global/qisenum.h | 14 +- src/corelib/global/qlibraryinfo.cpp | 18 +- src/corelib/global/qlibraryinfo.h | 14 +- src/corelib/global/qlogging.cpp | 14 +- src/corelib/global/qlogging.h | 14 +- src/corelib/global/qmalloc.cpp | 14 +- src/corelib/global/qnamespace.h | 14 +- src/corelib/global/qnamespace.qdoc | 12 +- src/corelib/global/qnumeric.cpp | 14 +- src/corelib/global/qnumeric.h | 14 +- src/corelib/global/qnumeric_p.h | 14 +- src/corelib/global/qprocessordetection.h | 14 +- src/corelib/global/qsysinfo.h | 14 +- src/corelib/global/qsystemdetection.h | 14 +- src/corelib/global/qt_pch.h | 14 +- src/corelib/global/qt_windows.h | 14 +- src/corelib/global/qtypeinfo.h | 14 +- src/corelib/global/qtypetraits.h | 12 +- src/corelib/io/forkfd_qt.cpp | 34 ++- src/corelib/io/qabstractfileengine.cpp | 14 +- src/corelib/io/qabstractfileengine_p.h | 14 +- src/corelib/io/qbuffer.cpp | 14 +- src/corelib/io/qbuffer.h | 14 +- src/corelib/io/qdatastream.cpp | 14 +- src/corelib/io/qdatastream.h | 14 +- src/corelib/io/qdatastream_p.h | 14 +- src/corelib/io/qdataurl.cpp | 14 +- src/corelib/io/qdataurl_p.h | 14 +- src/corelib/io/qdebug.cpp | 14 +- src/corelib/io/qdebug.h | 14 +- src/corelib/io/qdir.cpp | 14 +- src/corelib/io/qdir.h | 14 +- src/corelib/io/qdir_p.h | 14 +- src/corelib/io/qdiriterator.cpp | 14 +- src/corelib/io/qdiriterator.h | 14 +- src/corelib/io/qfile.cpp | 14 +- src/corelib/io/qfile.h | 14 +- src/corelib/io/qfile_p.h | 14 +- src/corelib/io/qfiledevice.cpp | 14 +- src/corelib/io/qfiledevice.h | 14 +- src/corelib/io/qfiledevice_p.h | 14 +- src/corelib/io/qfileinfo.cpp | 14 +- src/corelib/io/qfileinfo.h | 14 +- src/corelib/io/qfileinfo_p.h | 14 +- src/corelib/io/qfileselector.cpp | 12 +- src/corelib/io/qfileselector.h | 12 +- src/corelib/io/qfileselector_p.h | 12 +- src/corelib/io/qfilesystemengine.cpp | 14 +- src/corelib/io/qfilesystemengine_p.h | 14 +- src/corelib/io/qfilesystemengine_unix.cpp | 14 +- src/corelib/io/qfilesystemengine_win.cpp | 14 +- src/corelib/io/qfilesystementry.cpp | 14 +- src/corelib/io/qfilesystementry_p.h | 14 +- src/corelib/io/qfilesystemiterator_p.h | 14 +- src/corelib/io/qfilesystemiterator_unix.cpp | 14 +- src/corelib/io/qfilesystemiterator_win.cpp | 14 +- src/corelib/io/qfilesystemmetadata_p.h | 14 +- src/corelib/io/qfilesystemwatcher.cpp | 14 +- src/corelib/io/qfilesystemwatcher.h | 14 +- src/corelib/io/qfilesystemwatcher_fsevents.mm | 36 ++- .../io/qfilesystemwatcher_fsevents_p.h | 14 +- src/corelib/io/qfilesystemwatcher_inotify.cpp | 14 +- src/corelib/io/qfilesystemwatcher_inotify_p.h | 14 +- src/corelib/io/qfilesystemwatcher_kqueue.cpp | 14 +- src/corelib/io/qfilesystemwatcher_kqueue_p.h | 14 +- src/corelib/io/qfilesystemwatcher_p.h | 14 +- src/corelib/io/qfilesystemwatcher_polling.cpp | 14 +- src/corelib/io/qfilesystemwatcher_polling_p.h | 14 +- src/corelib/io/qfilesystemwatcher_win.cpp | 14 +- src/corelib/io/qfilesystemwatcher_win_p.h | 14 +- src/corelib/io/qfsfileengine.cpp | 14 +- src/corelib/io/qfsfileengine_iterator.cpp | 14 +- src/corelib/io/qfsfileengine_iterator_p.h | 14 +- src/corelib/io/qfsfileengine_p.h | 14 +- src/corelib/io/qfsfileengine_unix.cpp | 14 +- src/corelib/io/qfsfileengine_win.cpp | 14 +- src/corelib/io/qiodevice.cpp | 14 +- src/corelib/io/qiodevice.h | 14 +- src/corelib/io/qiodevice_p.h | 14 +- src/corelib/io/qipaddress.cpp | 12 +- src/corelib/io/qipaddress_p.h | 12 +- src/corelib/io/qlockfile.cpp | 12 +- src/corelib/io/qlockfile.h | 12 +- src/corelib/io/qlockfile_p.h | 12 +- src/corelib/io/qlockfile_unix.cpp | 12 +- src/corelib/io/qlockfile_win.cpp | 12 +- src/corelib/io/qloggingcategory.cpp | 14 +- src/corelib/io/qloggingcategory.h | 14 +- src/corelib/io/qloggingregistry.cpp | 14 +- src/corelib/io/qloggingregistry_p.h | 14 +- src/corelib/io/qnoncontiguousbytedevice.cpp | 14 +- src/corelib/io/qnoncontiguousbytedevice_p.h | 14 +- src/corelib/io/qprocess.cpp | 14 +- src/corelib/io/qprocess.h | 14 +- src/corelib/io/qprocess_p.h | 14 +- src/corelib/io/qprocess_unix.cpp | 14 +- src/corelib/io/qprocess_win.cpp | 14 +- src/corelib/io/qprocess_wince.cpp | 14 +- src/corelib/io/qresource.cpp | 14 +- src/corelib/io/qresource.h | 14 +- src/corelib/io/qresource_iterator.cpp | 14 +- src/corelib/io/qresource_iterator_p.h | 14 +- src/corelib/io/qresource_p.h | 14 +- src/corelib/io/qsavefile.cpp | 12 +- src/corelib/io/qsavefile.h | 12 +- src/corelib/io/qsavefile_p.h | 12 +- src/corelib/io/qsettings.cpp | 14 +- src/corelib/io/qsettings.h | 14 +- src/corelib/io/qsettings_mac.cpp | 14 +- src/corelib/io/qsettings_p.h | 14 +- src/corelib/io/qsettings_win.cpp | 14 +- src/corelib/io/qsettings_winrt.cpp | 36 ++- src/corelib/io/qstandardpaths.cpp | 14 +- src/corelib/io/qstandardpaths.h | 14 +- src/corelib/io/qstandardpaths_android.cpp | 14 +- src/corelib/io/qstandardpaths_blackberry.cpp | 12 +- src/corelib/io/qstandardpaths_haiku.cpp | 34 ++- src/corelib/io/qstandardpaths_ios.mm | 36 ++- src/corelib/io/qstandardpaths_mac.mm | 14 +- src/corelib/io/qstandardpaths_unix.cpp | 14 +- src/corelib/io/qstandardpaths_win.cpp | 14 +- src/corelib/io/qstandardpaths_winrt.cpp | 14 +- src/corelib/io/qstorageinfo.cpp | 34 ++- src/corelib/io/qstorageinfo.h | 34 ++- src/corelib/io/qstorageinfo_mac.cpp | 34 ++- src/corelib/io/qstorageinfo_p.h | 34 ++- src/corelib/io/qstorageinfo_stub.cpp | 12 +- src/corelib/io/qstorageinfo_unix.cpp | 34 ++- src/corelib/io/qstorageinfo_win.cpp | 34 ++- src/corelib/io/qtemporarydir.cpp | 14 +- src/corelib/io/qtemporarydir.h | 14 +- src/corelib/io/qtemporaryfile.cpp | 14 +- src/corelib/io/qtemporaryfile.h | 14 +- src/corelib/io/qtemporaryfile_p.h | 14 +- src/corelib/io/qtextstream.cpp | 14 +- src/corelib/io/qtextstream.h | 14 +- src/corelib/io/qtextstream_p.h | 14 +- src/corelib/io/qtldurl.cpp | 14 +- src/corelib/io/qtldurl_p.h | 14 +- src/corelib/io/qurl.cpp | 16 +- src/corelib/io/qurl.h | 14 +- src/corelib/io/qurl_mac.mm | 36 ++- src/corelib/io/qurl_p.h | 14 +- src/corelib/io/qurlidna.cpp | 14 +- src/corelib/io/qurlquery.cpp | 12 +- src/corelib/io/qurlquery.h | 12 +- src/corelib/io/qurlrecode.cpp | 12 +- src/corelib/io/qwindowspipereader.cpp | 14 +- src/corelib/io/qwindowspipereader_p.h | 14 +- src/corelib/io/qwindowspipewriter.cpp | 14 +- src/corelib/io/qwindowspipewriter_p.h | 14 +- src/corelib/io/qwinoverlappedionotifier.cpp | 14 +- src/corelib/io/qwinoverlappedionotifier_p.h | 14 +- src/corelib/itemmodels/qabstractitemmodel.cpp | 14 +- src/corelib/itemmodels/qabstractitemmodel.h | 14 +- src/corelib/itemmodels/qabstractitemmodel_p.h | 14 +- .../itemmodels/qabstractproxymodel.cpp | 14 +- src/corelib/itemmodels/qabstractproxymodel.h | 14 +- .../itemmodels/qabstractproxymodel_p.h | 14 +- .../itemmodels/qidentityproxymodel.cpp | 12 +- src/corelib/itemmodels/qidentityproxymodel.h | 12 +- .../itemmodels/qitemselectionmodel.cpp | 14 +- src/corelib/itemmodels/qitemselectionmodel.h | 14 +- .../itemmodels/qitemselectionmodel_p.h | 14 +- .../itemmodels/qsortfilterproxymodel.cpp | 14 +- .../itemmodels/qsortfilterproxymodel.h | 14 +- src/corelib/itemmodels/qstringlistmodel.cpp | 14 +- src/corelib/itemmodels/qstringlistmodel.h | 14 +- src/corelib/json/qjson.cpp | 14 +- src/corelib/json/qjson_p.h | 14 +- src/corelib/json/qjsonarray.cpp | 14 +- src/corelib/json/qjsonarray.h | 14 +- src/corelib/json/qjsondocument.cpp | 14 +- src/corelib/json/qjsondocument.h | 14 +- src/corelib/json/qjsonobject.cpp | 14 +- src/corelib/json/qjsonobject.h | 14 +- src/corelib/json/qjsonparser.cpp | 14 +- src/corelib/json/qjsonparser_p.h | 14 +- src/corelib/json/qjsonvalue.cpp | 14 +- src/corelib/json/qjsonvalue.h | 14 +- src/corelib/json/qjsonwriter.cpp | 14 +- src/corelib/json/qjsonwriter_p.h | 14 +- .../kernel/qabstracteventdispatcher.cpp | 14 +- src/corelib/kernel/qabstracteventdispatcher.h | 14 +- .../kernel/qabstracteventdispatcher_p.h | 14 +- .../kernel/qabstractnativeeventfilter.cpp | 14 +- .../kernel/qabstractnativeeventfilter.h | 14 +- src/corelib/kernel/qbasictimer.cpp | 14 +- src/corelib/kernel/qbasictimer.h | 14 +- src/corelib/kernel/qcore_mac.cpp | 14 +- src/corelib/kernel/qcore_mac_objc.mm | 36 ++- src/corelib/kernel/qcore_mac_p.h | 14 +- src/corelib/kernel/qcore_unix.cpp | 14 +- src/corelib/kernel/qcore_unix_p.h | 14 +- src/corelib/kernel/qcoreapplication.cpp | 14 +- src/corelib/kernel/qcoreapplication.h | 14 +- src/corelib/kernel/qcoreapplication_mac.cpp | 14 +- src/corelib/kernel/qcoreapplication_p.h | 14 +- src/corelib/kernel/qcoreapplication_win.cpp | 14 +- src/corelib/kernel/qcorecmdlineargs_p.h | 14 +- src/corelib/kernel/qcoreevent.cpp | 14 +- src/corelib/kernel/qcoreevent.h | 14 +- src/corelib/kernel/qcoreglobaldata.cpp | 14 +- src/corelib/kernel/qcoreglobaldata_p.h | 14 +- src/corelib/kernel/qcrashhandler.cpp | 14 +- src/corelib/kernel/qcrashhandler_p.h | 14 +- .../kernel/qeventdispatcher_blackberry.cpp | 12 +- .../kernel/qeventdispatcher_blackberry_p.h | 12 +- src/corelib/kernel/qeventdispatcher_glib.cpp | 14 +- src/corelib/kernel/qeventdispatcher_glib_p.h | 14 +- src/corelib/kernel/qeventdispatcher_unix.cpp | 14 +- src/corelib/kernel/qeventdispatcher_unix_p.h | 14 +- src/corelib/kernel/qeventdispatcher_win.cpp | 14 +- src/corelib/kernel/qeventdispatcher_win_p.h | 14 +- src/corelib/kernel/qeventdispatcher_winrt.cpp | 14 +- src/corelib/kernel/qeventdispatcher_winrt_p.h | 14 +- src/corelib/kernel/qeventloop.cpp | 14 +- src/corelib/kernel/qeventloop.h | 14 +- src/corelib/kernel/qeventloop_p.h | 14 +- src/corelib/kernel/qfunctions_nacl.cpp | 14 +- src/corelib/kernel/qfunctions_nacl.h | 14 +- src/corelib/kernel/qfunctions_p.h | 14 +- src/corelib/kernel/qfunctions_vxworks.cpp | 14 +- src/corelib/kernel/qfunctions_vxworks.h | 14 +- src/corelib/kernel/qfunctions_wince.cpp | 14 +- src/corelib/kernel/qfunctions_wince.h | 14 +- src/corelib/kernel/qfunctions_winrt.cpp | 14 +- src/corelib/kernel/qfunctions_winrt.h | 14 +- src/corelib/kernel/qjni.cpp | 14 +- src/corelib/kernel/qjni_p.h | 14 +- src/corelib/kernel/qjnihelpers.cpp | 14 +- src/corelib/kernel/qjnihelpers_p.h | 14 +- src/corelib/kernel/qjnionload.cpp | 14 +- src/corelib/kernel/qmath.cpp | 14 +- src/corelib/kernel/qmath.h | 14 +- src/corelib/kernel/qmath.qdoc | 12 +- src/corelib/kernel/qmetaobject.cpp | 14 +- src/corelib/kernel/qmetaobject.h | 14 +- src/corelib/kernel/qmetaobject_moc_p.h | 14 +- src/corelib/kernel/qmetaobject_p.h | 14 +- src/corelib/kernel/qmetaobjectbuilder.cpp | 14 +- src/corelib/kernel/qmetaobjectbuilder_p.h | 14 +- src/corelib/kernel/qmetatype.cpp | 14 +- src/corelib/kernel/qmetatype.h | 14 +- src/corelib/kernel/qmetatype_p.h | 14 +- src/corelib/kernel/qmetatypeswitcher_p.h | 14 +- src/corelib/kernel/qmimedata.cpp | 14 +- src/corelib/kernel/qmimedata.h | 14 +- src/corelib/kernel/qobject.cpp | 14 +- src/corelib/kernel/qobject.h | 14 +- src/corelib/kernel/qobject_impl.h | 14 +- src/corelib/kernel/qobject_p.h | 14 +- src/corelib/kernel/qobjectcleanuphandler.cpp | 14 +- src/corelib/kernel/qobjectcleanuphandler.h | 14 +- src/corelib/kernel/qobjectdefs.h | 14 +- src/corelib/kernel/qobjectdefs_impl.h | 14 +- src/corelib/kernel/qpointer.cpp | 14 +- src/corelib/kernel/qpointer.h | 14 +- src/corelib/kernel/qppsattribute.cpp | 12 +- src/corelib/kernel/qppsattribute_p.h | 12 +- src/corelib/kernel/qppsattributeprivate_p.h | 12 +- src/corelib/kernel/qppsobject.cpp | 12 +- src/corelib/kernel/qppsobject_p.h | 12 +- src/corelib/kernel/qppsobjectprivate_p.h | 12 +- src/corelib/kernel/qsharedmemory.cpp | 14 +- src/corelib/kernel/qsharedmemory.h | 14 +- src/corelib/kernel/qsharedmemory_android.cpp | 12 +- src/corelib/kernel/qsharedmemory_p.h | 14 +- src/corelib/kernel/qsharedmemory_posix.cpp | 14 +- src/corelib/kernel/qsharedmemory_systemv.cpp | 14 +- src/corelib/kernel/qsharedmemory_unix.cpp | 14 +- src/corelib/kernel/qsharedmemory_win.cpp | 14 +- src/corelib/kernel/qsignalmapper.cpp | 14 +- src/corelib/kernel/qsignalmapper.h | 14 +- src/corelib/kernel/qsocketnotifier.cpp | 14 +- src/corelib/kernel/qsocketnotifier.h | 14 +- src/corelib/kernel/qsystemerror.cpp | 14 +- src/corelib/kernel/qsystemerror_p.h | 14 +- src/corelib/kernel/qsystemsemaphore.cpp | 14 +- src/corelib/kernel/qsystemsemaphore.h | 14 +- .../kernel/qsystemsemaphore_android.cpp | 12 +- src/corelib/kernel/qsystemsemaphore_p.h | 14 +- src/corelib/kernel/qsystemsemaphore_posix.cpp | 14 +- .../kernel/qsystemsemaphore_systemv.cpp | 14 +- src/corelib/kernel/qsystemsemaphore_unix.cpp | 14 +- src/corelib/kernel/qsystemsemaphore_win.cpp | 14 +- src/corelib/kernel/qtcore_eval.cpp | 28 +-- src/corelib/kernel/qtimer.cpp | 14 +- src/corelib/kernel/qtimer.h | 14 +- src/corelib/kernel/qtimerinfo_unix.cpp | 14 +- src/corelib/kernel/qtimerinfo_unix_p.h | 14 +- src/corelib/kernel/qtranslator.cpp | 14 +- src/corelib/kernel/qtranslator.h | 14 +- src/corelib/kernel/qtranslator_p.h | 14 +- src/corelib/kernel/qvariant.cpp | 14 +- src/corelib/kernel/qvariant.h | 14 +- src/corelib/kernel/qvariant_p.h | 14 +- src/corelib/kernel/qwineventnotifier.cpp | 14 +- src/corelib/kernel/qwineventnotifier.h | 14 +- src/corelib/mimetypes/qmimedatabase.cpp | 14 +- src/corelib/mimetypes/qmimedatabase.h | 14 +- src/corelib/mimetypes/qmimedatabase_p.h | 14 +- src/corelib/mimetypes/qmimeglobpattern.cpp | 14 +- src/corelib/mimetypes/qmimeglobpattern_p.h | 14 +- src/corelib/mimetypes/qmimemagicrule.cpp | 14 +- src/corelib/mimetypes/qmimemagicrule_p.h | 14 +- .../mimetypes/qmimemagicrulematcher.cpp | 14 +- .../mimetypes/qmimemagicrulematcher_p.h | 14 +- src/corelib/mimetypes/qmimeprovider.cpp | 14 +- src/corelib/mimetypes/qmimeprovider_p.h | 14 +- src/corelib/mimetypes/qmimetype.cpp | 14 +- src/corelib/mimetypes/qmimetype.h | 14 +- src/corelib/mimetypes/qmimetype_p.h | 14 +- src/corelib/mimetypes/qmimetypeparser.cpp | 14 +- src/corelib/mimetypes/qmimetypeparser_p.h | 14 +- src/corelib/plugin/qelfparser_p.cpp | 14 +- src/corelib/plugin/qelfparser_p.h | 14 +- src/corelib/plugin/qfactoryinterface.h | 14 +- src/corelib/plugin/qfactoryloader.cpp | 14 +- src/corelib/plugin/qfactoryloader_p.h | 14 +- src/corelib/plugin/qlibrary.cpp | 14 +- src/corelib/plugin/qlibrary.h | 14 +- src/corelib/plugin/qlibrary_p.h | 14 +- src/corelib/plugin/qlibrary_unix.cpp | 14 +- src/corelib/plugin/qlibrary_win.cpp | 14 +- src/corelib/plugin/qmachparser.cpp | 12 +- src/corelib/plugin/qmachparser_p.h | 12 +- src/corelib/plugin/qplugin.h | 14 +- src/corelib/plugin/qplugin.qdoc | 12 +- src/corelib/plugin/qpluginloader.cpp | 14 +- src/corelib/plugin/qpluginloader.h | 14 +- src/corelib/plugin/qsystemlibrary.cpp | 14 +- src/corelib/plugin/qsystemlibrary_p.h | 14 +- src/corelib/plugin/quuid.cpp | 14 +- src/corelib/plugin/quuid.h | 14 +- src/corelib/statemachine/qabstractstate.cpp | 14 +- src/corelib/statemachine/qabstractstate.h | 14 +- src/corelib/statemachine/qabstractstate_p.h | 14 +- .../statemachine/qabstracttransition.cpp | 14 +- .../statemachine/qabstracttransition.h | 14 +- .../statemachine/qabstracttransition_p.h | 14 +- src/corelib/statemachine/qeventtransition.cpp | 14 +- src/corelib/statemachine/qeventtransition.h | 14 +- src/corelib/statemachine/qeventtransition_p.h | 14 +- src/corelib/statemachine/qfinalstate.cpp | 14 +- src/corelib/statemachine/qfinalstate.h | 14 +- src/corelib/statemachine/qhistorystate.cpp | 14 +- src/corelib/statemachine/qhistorystate.h | 14 +- src/corelib/statemachine/qhistorystate_p.h | 14 +- .../statemachine/qsignaleventgenerator_p.h | 14 +- .../statemachine/qsignaltransition.cpp | 14 +- src/corelib/statemachine/qsignaltransition.h | 14 +- .../statemachine/qsignaltransition_p.h | 14 +- src/corelib/statemachine/qstate.cpp | 14 +- src/corelib/statemachine/qstate.h | 14 +- src/corelib/statemachine/qstate_p.h | 14 +- src/corelib/statemachine/qstatemachine.cpp | 14 +- src/corelib/statemachine/qstatemachine.h | 14 +- src/corelib/statemachine/qstatemachine_p.h | 14 +- src/corelib/thread/qatomic.cpp | 14 +- src/corelib/thread/qatomic.h | 14 +- src/corelib/thread/qbasicatomic.h | 12 +- src/corelib/thread/qexception.cpp | 14 +- src/corelib/thread/qexception.h | 14 +- src/corelib/thread/qfuture.h | 14 +- src/corelib/thread/qfuture.qdoc | 14 +- src/corelib/thread/qfutureinterface.cpp | 14 +- src/corelib/thread/qfutureinterface.h | 14 +- src/corelib/thread/qfutureinterface_p.h | 14 +- src/corelib/thread/qfuturesynchronizer.h | 14 +- src/corelib/thread/qfuturesynchronizer.qdoc | 14 +- src/corelib/thread/qfuturewatcher.cpp | 14 +- src/corelib/thread/qfuturewatcher.h | 14 +- src/corelib/thread/qfuturewatcher_p.h | 14 +- src/corelib/thread/qgenericatomic.h | 12 +- src/corelib/thread/qmutex.cpp | 14 +- src/corelib/thread/qmutex.h | 14 +- src/corelib/thread/qmutex_linux.cpp | 14 +- src/corelib/thread/qmutex_mac.cpp | 14 +- src/corelib/thread/qmutex_p.h | 14 +- src/corelib/thread/qmutex_unix.cpp | 14 +- src/corelib/thread/qmutex_win.cpp | 14 +- src/corelib/thread/qmutexpool.cpp | 14 +- src/corelib/thread/qmutexpool_p.h | 14 +- src/corelib/thread/qorderedmutexlocker_p.h | 14 +- src/corelib/thread/qreadwritelock.cpp | 14 +- src/corelib/thread/qreadwritelock.h | 14 +- src/corelib/thread/qreadwritelock_p.h | 14 +- src/corelib/thread/qresultstore.cpp | 14 +- src/corelib/thread/qresultstore.h | 14 +- src/corelib/thread/qrunnable.cpp | 14 +- src/corelib/thread/qrunnable.h | 14 +- src/corelib/thread/qsemaphore.cpp | 14 +- src/corelib/thread/qsemaphore.h | 14 +- src/corelib/thread/qthread.cpp | 14 +- src/corelib/thread/qthread.h | 14 +- src/corelib/thread/qthread_p.h | 14 +- src/corelib/thread/qthread_unix.cpp | 14 +- src/corelib/thread/qthread_win.cpp | 14 +- src/corelib/thread/qthread_winrt.cpp | 14 +- src/corelib/thread/qthreadpool.cpp | 14 +- src/corelib/thread/qthreadpool.h | 14 +- src/corelib/thread/qthreadpool_p.h | 14 +- src/corelib/thread/qthreadstorage.cpp | 14 +- src/corelib/thread/qthreadstorage.h | 14 +- src/corelib/thread/qwaitcondition.h | 14 +- src/corelib/thread/qwaitcondition.qdoc | 12 +- src/corelib/thread/qwaitcondition_unix.cpp | 14 +- src/corelib/thread/qwaitcondition_win.cpp | 14 +- src/corelib/tools/qalgorithms.h | 14 +- src/corelib/tools/qalgorithms.qdoc | 12 +- src/corelib/tools/qarraydata.cpp | 14 +- src/corelib/tools/qarraydata.h | 14 +- src/corelib/tools/qarraydataops.h | 14 +- src/corelib/tools/qarraydatapointer.h | 14 +- src/corelib/tools/qbitarray.cpp | 14 +- src/corelib/tools/qbitarray.h | 14 +- src/corelib/tools/qbytearray.cpp | 14 +- src/corelib/tools/qbytearray.h | 14 +- src/corelib/tools/qbytearray_mac.mm | 36 ++- src/corelib/tools/qbytearraylist.cpp | 36 ++- src/corelib/tools/qbytearraylist.h | 36 ++- src/corelib/tools/qbytearraymatcher.cpp | 14 +- src/corelib/tools/qbytearraymatcher.h | 14 +- src/corelib/tools/qbytedata_p.h | 14 +- src/corelib/tools/qcache.h | 14 +- src/corelib/tools/qcache.qdoc | 12 +- src/corelib/tools/qchar.cpp | 14 +- src/corelib/tools/qchar.h | 14 +- src/corelib/tools/qcollator.cpp | 14 +- src/corelib/tools/qcollator.h | 14 +- src/corelib/tools/qcollator_icu.cpp | 14 +- src/corelib/tools/qcollator_macx.cpp | 12 +- src/corelib/tools/qcollator_p.h | 14 +- src/corelib/tools/qcollator_posix.cpp | 12 +- src/corelib/tools/qcollator_win.cpp | 12 +- src/corelib/tools/qcommandlineoption.cpp | 12 +- src/corelib/tools/qcommandlineoption.h | 12 +- src/corelib/tools/qcommandlineparser.cpp | 12 +- src/corelib/tools/qcommandlineparser.h | 12 +- src/corelib/tools/qcontainerfwd.h | 14 +- src/corelib/tools/qcontiguouscache.cpp | 14 +- src/corelib/tools/qcontiguouscache.h | 14 +- src/corelib/tools/qcryptographichash.cpp | 14 +- src/corelib/tools/qcryptographichash.h | 14 +- src/corelib/tools/qdatetime.cpp | 16 +- src/corelib/tools/qdatetime.h | 14 +- src/corelib/tools/qdatetime_mac.mm | 36 ++- src/corelib/tools/qdatetime_p.h | 14 +- src/corelib/tools/qdatetimeparser.cpp | 14 +- src/corelib/tools/qdatetimeparser_p.h | 14 +- src/corelib/tools/qeasingcurve.cpp | 14 +- src/corelib/tools/qeasingcurve.h | 14 +- src/corelib/tools/qelapsedtimer.cpp | 14 +- src/corelib/tools/qelapsedtimer.h | 14 +- src/corelib/tools/qelapsedtimer_generic.cpp | 14 +- src/corelib/tools/qelapsedtimer_mac.cpp | 14 +- src/corelib/tools/qelapsedtimer_unix.cpp | 14 +- src/corelib/tools/qelapsedtimer_win.cpp | 14 +- src/corelib/tools/qfreelist.cpp | 14 +- src/corelib/tools/qfreelist_p.h | 14 +- src/corelib/tools/qharfbuzz.cpp | 14 +- src/corelib/tools/qharfbuzz_p.h | 14 +- src/corelib/tools/qhash.cpp | 14 +- src/corelib/tools/qhash.h | 14 +- src/corelib/tools/qiterator.h | 14 +- src/corelib/tools/qiterator.qdoc | 12 +- src/corelib/tools/qline.cpp | 14 +- src/corelib/tools/qline.h | 14 +- src/corelib/tools/qlinkedlist.cpp | 14 +- src/corelib/tools/qlinkedlist.h | 14 +- src/corelib/tools/qlist.cpp | 14 +- src/corelib/tools/qlist.h | 14 +- src/corelib/tools/qlocale.cpp | 14 +- src/corelib/tools/qlocale.h | 14 +- src/corelib/tools/qlocale.qdoc | 12 +- src/corelib/tools/qlocale_blackberry.cpp | 14 +- src/corelib/tools/qlocale_blackberry.h | 14 +- src/corelib/tools/qlocale_data_p.h | 14 +- src/corelib/tools/qlocale_icu.cpp | 14 +- src/corelib/tools/qlocale_mac.mm | 36 ++- src/corelib/tools/qlocale_p.h | 14 +- src/corelib/tools/qlocale_tools.cpp | 14 +- src/corelib/tools/qlocale_tools_p.h | 14 +- src/corelib/tools/qlocale_unix.cpp | 14 +- src/corelib/tools/qlocale_win.cpp | 14 +- src/corelib/tools/qmap.cpp | 14 +- src/corelib/tools/qmap.h | 14 +- src/corelib/tools/qmargins.cpp | 14 +- src/corelib/tools/qmargins.h | 14 +- .../tools/qmessageauthenticationcode.cpp | 12 +- .../tools/qmessageauthenticationcode.h | 12 +- src/corelib/tools/qpair.h | 14 +- src/corelib/tools/qpair.qdoc | 12 +- src/corelib/tools/qpodlist_p.h | 14 +- src/corelib/tools/qpoint.cpp | 14 +- src/corelib/tools/qpoint.h | 14 +- src/corelib/tools/qqueue.cpp | 14 +- src/corelib/tools/qqueue.h | 14 +- src/corelib/tools/qrect.cpp | 14 +- src/corelib/tools/qrect.h | 14 +- src/corelib/tools/qrefcount.cpp | 14 +- src/corelib/tools/qrefcount.h | 14 +- src/corelib/tools/qregexp.cpp | 14 +- src/corelib/tools/qregexp.h | 14 +- src/corelib/tools/qregularexpression.cpp | 14 +- src/corelib/tools/qregularexpression.h | 12 +- src/corelib/tools/qringbuffer_p.h | 14 +- src/corelib/tools/qscopedpointer.cpp | 14 +- src/corelib/tools/qscopedpointer.h | 14 +- src/corelib/tools/qscopedpointer_p.h | 14 +- src/corelib/tools/qscopedvaluerollback.cpp | 14 +- src/corelib/tools/qscopedvaluerollback.h | 14 +- src/corelib/tools/qset.h | 14 +- src/corelib/tools/qset.qdoc | 12 +- src/corelib/tools/qshareddata.cpp | 14 +- src/corelib/tools/qshareddata.h | 14 +- src/corelib/tools/qsharedpointer.cpp | 14 +- src/corelib/tools/qsharedpointer.h | 14 +- src/corelib/tools/qsharedpointer_impl.h | 14 +- src/corelib/tools/qsimd.cpp | 14 +- src/corelib/tools/qsimd_p.h | 14 +- src/corelib/tools/qsize.cpp | 14 +- src/corelib/tools/qsize.h | 14 +- src/corelib/tools/qstack.cpp | 14 +- src/corelib/tools/qstack.h | 14 +- src/corelib/tools/qstring.cpp | 14 +- src/corelib/tools/qstring.h | 14 +- src/corelib/tools/qstring_compat.cpp | 12 +- src/corelib/tools/qstring_mac.mm | 36 ++- src/corelib/tools/qstring_mips_dsp_asm.S | 34 ++- src/corelib/tools/qstringalgorithms_p.h | 34 ++- src/corelib/tools/qstringbuilder.cpp | 14 +- src/corelib/tools/qstringbuilder.h | 14 +- src/corelib/tools/qstringiterator.qdoc | 12 +- src/corelib/tools/qstringiterator_p.h | 14 +- src/corelib/tools/qstringlist.cpp | 14 +- src/corelib/tools/qstringlist.h | 14 +- src/corelib/tools/qstringmatcher.cpp | 14 +- src/corelib/tools/qstringmatcher.h | 14 +- src/corelib/tools/qtextboundaryfinder.cpp | 14 +- src/corelib/tools/qtextboundaryfinder.h | 14 +- src/corelib/tools/qtimeline.cpp | 14 +- src/corelib/tools/qtimeline.h | 14 +- src/corelib/tools/qtimezone.cpp | 12 +- src/corelib/tools/qtimezone.h | 12 +- src/corelib/tools/qtimezoneprivate.cpp | 12 +- .../tools/qtimezoneprivate_android.cpp | 12 +- src/corelib/tools/qtimezoneprivate_data_p.h | 12 +- src/corelib/tools/qtimezoneprivate_icu.cpp | 12 +- src/corelib/tools/qtimezoneprivate_mac.mm | 34 ++- src/corelib/tools/qtimezoneprivate_p.h | 12 +- src/corelib/tools/qtimezoneprivate_tz.cpp | 12 +- src/corelib/tools/qtimezoneprivate_win.cpp | 12 +- src/corelib/tools/qtools_p.h | 14 +- src/corelib/tools/qunicodetables.cpp | 14 +- src/corelib/tools/qunicodetables_p.h | 14 +- src/corelib/tools/qunicodetools.cpp | 14 +- src/corelib/tools/qunicodetools_p.h | 14 +- src/corelib/tools/qvarlengtharray.h | 14 +- src/corelib/tools/qvarlengtharray.qdoc | 12 +- src/corelib/tools/qvector.cpp | 14 +- src/corelib/tools/qvector.h | 14 +- src/corelib/tools/qvector_msvc.cpp | 12 +- src/corelib/tools/qversionnumber.cpp | 36 ++- src/corelib/tools/qversionnumber_p.h | 36 ++- src/corelib/tools/qvsnprintf.cpp | 14 +- src/corelib/xml/make-parser.sh | 38 ++- src/corelib/xml/qxmlstream.cpp | 14 +- src/corelib/xml/qxmlstream.g | 36 ++- src/corelib/xml/qxmlstream.h | 14 +- src/corelib/xml/qxmlstream_p.h | 14 +- src/corelib/xml/qxmlutils.cpp | 14 +- src/corelib/xml/qxmlutils_p.h | 14 +- src/dbus/Qt5DBusMacros.cmake | 2 +- src/dbus/dbus_minimal_p.h | 12 +- .../snippets/code/doc_src_introtodbus.qdoc | 10 +- .../snippets/code/doc_src_qdbusadaptors.cpp | 10 +- src/dbus/doc/snippets/code/doc_src_qtdbus.cpp | 10 +- .../code/src_qdbus_qdbusabstractinterface.cpp | 10 +- .../snippets/code/src_qdbus_qdbusargument.cpp | 10 +- .../snippets/code/src_qdbus_qdbuscontext.cpp | 10 +- .../code/src_qdbus_qdbusinterface.cpp | 10 +- .../snippets/code/src_qdbus_qdbusmetatype.cpp | 10 +- .../code/src_qdbus_qdbuspendingcall.cpp | 10 +- .../code/src_qdbus_qdbuspendingreply.cpp | 10 +- .../snippets/code/src_qdbus_qdbusreply.cpp | 10 +- .../qdbusextratypes/qdbusextratypes.cpp | 10 +- src/dbus/doc/src/dbus-adaptors.qdoc | 12 +- src/dbus/doc/src/qdbusxml2cpp.qdoc | 12 +- src/dbus/doc/src/qtdbus-examples.qdoc | 12 +- src/dbus/doc/src/qtdbus-index.qdoc | 12 +- src/dbus/doc/src/qtdbus-module.qdoc | 12 +- src/dbus/qdbus_symbols.cpp | 14 +- src/dbus/qdbus_symbols_p.h | 14 +- src/dbus/qdbusabstractadaptor.cpp | 14 +- src/dbus/qdbusabstractadaptor.h | 14 +- src/dbus/qdbusabstractadaptor_p.h | 14 +- src/dbus/qdbusabstractinterface.cpp | 14 +- src/dbus/qdbusabstractinterface.h | 14 +- src/dbus/qdbusabstractinterface_p.h | 14 +- src/dbus/qdbusargument.cpp | 14 +- src/dbus/qdbusargument.h | 14 +- src/dbus/qdbusargument_p.h | 14 +- src/dbus/qdbusconnection.cpp | 14 +- src/dbus/qdbusconnection.h | 14 +- src/dbus/qdbusconnection_p.h | 14 +- src/dbus/qdbusconnectioninterface.cpp | 14 +- src/dbus/qdbusconnectioninterface.h | 14 +- src/dbus/qdbusconnectionmanager_p.h | 14 +- src/dbus/qdbuscontext.cpp | 14 +- src/dbus/qdbuscontext.h | 14 +- src/dbus/qdbuscontext_p.h | 14 +- src/dbus/qdbusdemarshaller.cpp | 14 +- src/dbus/qdbuserror.cpp | 14 +- src/dbus/qdbuserror.h | 14 +- src/dbus/qdbusextratypes.cpp | 14 +- src/dbus/qdbusextratypes.h | 14 +- src/dbus/qdbusintegrator.cpp | 14 +- src/dbus/qdbusintegrator_p.h | 14 +- src/dbus/qdbusinterface.cpp | 14 +- src/dbus/qdbusinterface.h | 14 +- src/dbus/qdbusinterface_p.h | 14 +- src/dbus/qdbusinternalfilters.cpp | 14 +- src/dbus/qdbusintrospection.cpp | 14 +- src/dbus/qdbusintrospection_p.h | 14 +- src/dbus/qdbusmacros.h | 14 +- src/dbus/qdbusmarshaller.cpp | 14 +- src/dbus/qdbusmessage.cpp | 14 +- src/dbus/qdbusmessage.h | 14 +- src/dbus/qdbusmessage_p.h | 14 +- src/dbus/qdbusmetaobject.cpp | 14 +- src/dbus/qdbusmetaobject_p.h | 14 +- src/dbus/qdbusmetatype.cpp | 14 +- src/dbus/qdbusmetatype.h | 14 +- src/dbus/qdbusmetatype_p.h | 14 +- src/dbus/qdbusmisc.cpp | 14 +- src/dbus/qdbuspendingcall.cpp | 14 +- src/dbus/qdbuspendingcall.h | 14 +- src/dbus/qdbuspendingcall_p.h | 14 +- src/dbus/qdbuspendingreply.cpp | 14 +- src/dbus/qdbuspendingreply.h | 14 +- src/dbus/qdbusreply.cpp | 14 +- src/dbus/qdbusreply.h | 14 +- src/dbus/qdbusserver.cpp | 14 +- src/dbus/qdbusserver.h | 14 +- src/dbus/qdbusservicewatcher.cpp | 14 +- src/dbus/qdbusservicewatcher.h | 14 +- src/dbus/qdbusthreaddebug_p.h | 14 +- src/dbus/qdbusunixfiledescriptor.cpp | 14 +- src/dbus/qdbusunixfiledescriptor.h | 14 +- src/dbus/qdbusutil.cpp | 14 +- src/dbus/qdbusutil_p.h | 14 +- src/dbus/qdbusvirtualobject.cpp | 14 +- src/dbus/qdbusvirtualobject.h | 14 +- src/dbus/qdbusxmlgenerator.cpp | 14 +- src/dbus/qdbusxmlparser.cpp | 14 +- src/dbus/qdbusxmlparser_p.h | 14 +- src/gui/accessible/qaccessible.cpp | 14 +- src/gui/accessible/qaccessible.h | 14 +- src/gui/accessible/qaccessiblebridge.cpp | 14 +- src/gui/accessible/qaccessiblebridge.h | 14 +- src/gui/accessible/qaccessiblecache.cpp | 14 +- src/gui/accessible/qaccessiblecache_mac.mm | 38 ++- src/gui/accessible/qaccessiblecache_p.h | 14 +- src/gui/accessible/qaccessibleobject.cpp | 14 +- src/gui/accessible/qaccessibleobject.h | 14 +- src/gui/accessible/qaccessibleplugin.cpp | 14 +- src/gui/accessible/qaccessibleplugin.h | 14 +- src/gui/accessible/qplatformaccessibility.cpp | 14 +- src/gui/accessible/qplatformaccessibility.h | 14 +- src/gui/animation/qguivariantanimation.cpp | 14 +- src/gui/doc/snippets/brush/brush.cpp | 10 +- .../brush/gradientcreationsnippet.cpp | 10 +- src/gui/doc/snippets/clipboard/clipwindow.cpp | 10 +- src/gui/doc/snippets/clipboard/clipwindow.h | 10 +- src/gui/doc/snippets/clipboard/main.cpp | 10 +- .../doc/snippets/code/doc_src_coordsys.cpp | 10 +- .../doc/snippets/code/doc_src_richtext.cpp | 10 +- .../doc/snippets/code/doc_src_richtext.qdoc | 10 +- .../code/src_gui_accessible_qaccessible.cpp | 10 +- .../doc/snippets/code/src_gui_image_qicon.cpp | 10 +- .../snippets/code/src_gui_image_qimage.cpp | 10 +- .../code/src_gui_image_qimagereader.cpp | 10 +- .../code/src_gui_image_qimagewriter.cpp | 10 +- .../snippets/code/src_gui_image_qmovie.cpp | 10 +- .../snippets/code/src_gui_image_qpixmap.cpp | 10 +- .../code/src_gui_image_qpixmapcache.cpp | 10 +- .../src_gui_itemviews_qstandarditemmodel.cpp | 10 +- .../code/src_gui_kernel_qapplication.cpp | 10 +- .../code/src_gui_kernel_qclipboard.cpp | 10 +- .../snippets/code/src_gui_kernel_qevent.cpp | 10 +- .../code/src_gui_kernel_qguiapplication.cpp | 10 +- .../src_gui_kernel_qguiapplication_x11.cpp | 10 +- .../code/src_gui_kernel_qkeysequence.cpp | 10 +- .../code/src_gui_kernel_qshortcutmap.cpp | 10 +- .../snippets/code/src_gui_painting_qbrush.cpp | 10 +- .../snippets/code/src_gui_painting_qcolor.cpp | 10 +- .../code/src_gui_painting_qmatrix.cpp | 10 +- .../code/src_gui_painting_qpainter.cpp | 10 +- .../code/src_gui_painting_qpainterpath.cpp | 10 +- .../snippets/code/src_gui_painting_qpen.cpp | 10 +- .../code/src_gui_painting_qregion.cpp | 10 +- .../code/src_gui_painting_qregion_unix.cpp | 10 +- .../code/src_gui_painting_qtransform.cpp | 10 +- .../code/src_gui_qopenglshaderprogram.cpp | 10 +- .../doc/snippets/code/src_gui_text_qfont.cpp | 10 +- .../code/src_gui_text_qfontmetrics.cpp | 10 +- .../code/src_gui_text_qsyntaxhighlighter.cpp | 10 +- .../code/src_gui_text_qtextcursor.cpp | 10 +- .../code/src_gui_text_qtextdocument.cpp | 10 +- .../code/src_gui_text_qtextdocumentwriter.cpp | 10 +- .../code/src_gui_text_qtextlayout.cpp | 10 +- .../code/src_gui_util_qdesktopservices.cpp | 10 +- .../snippets/code/src_gui_util_qvalidator.cpp | 10 +- .../doc/snippets/draganddrop/dragwidget.cpp | 10 +- src/gui/doc/snippets/draganddrop/dragwidget.h | 10 +- src/gui/doc/snippets/draganddrop/main.cpp | 10 +- .../doc/snippets/draganddrop/mainwindow.cpp | 10 +- src/gui/doc/snippets/draganddrop/mainwindow.h | 10 +- src/gui/doc/snippets/dragging/main.cpp | 10 +- src/gui/doc/snippets/dragging/mainwindow.cpp | 10 +- src/gui/doc/snippets/dragging/mainwindow.h | 10 +- src/gui/doc/snippets/droparea.cpp | 10 +- src/gui/doc/snippets/dropevents/main.cpp | 10 +- src/gui/doc/snippets/dropevents/window.cpp | 10 +- src/gui/doc/snippets/dropevents/window.h | 10 +- src/gui/doc/snippets/droprectangle/main.cpp | 10 +- src/gui/doc/snippets/droprectangle/window.cpp | 10 +- src/gui/doc/snippets/droprectangle/window.h | 10 +- src/gui/doc/snippets/image/image.cpp | 10 +- .../doc/snippets/image/supportedformat.cpp | 10 +- src/gui/doc/snippets/matrix/matrix.cpp | 10 +- src/gui/doc/snippets/picture/picture.cpp | 10 +- src/gui/doc/snippets/plaintextlayout/main.cpp | 10 +- .../doc/snippets/plaintextlayout/window.cpp | 10 +- src/gui/doc/snippets/plaintextlayout/window.h | 10 +- src/gui/doc/snippets/polygon/polygon.cpp | 10 +- src/gui/doc/snippets/qfontdatabase/main.cpp | 10 +- src/gui/doc/snippets/qstatustipevent/main.cpp | 10 +- .../qtextobject/textobjectinterface.h | 10 +- src/gui/doc/snippets/scribe-overview/main.cpp | 10 +- .../doc/snippets/separations/finalwidget.cpp | 10 +- .../doc/snippets/separations/finalwidget.h | 10 +- src/gui/doc/snippets/separations/main.cpp | 10 +- .../doc/snippets/separations/screenwidget.cpp | 10 +- .../doc/snippets/separations/screenwidget.h | 10 +- .../doc/snippets/separations/separations.qdoc | 10 +- src/gui/doc/snippets/separations/viewer.cpp | 10 +- src/gui/doc/snippets/separations/viewer.h | 10 +- .../doc/snippets/textblock-formats/main.cpp | 10 +- .../doc/snippets/textblock-fragments/main.cpp | 10 +- .../textblock-fragments/mainwindow.cpp | 10 +- .../snippets/textblock-fragments/mainwindow.h | 10 +- .../textblock-fragments/xmlwriter.cpp | 10 +- .../snippets/textblock-fragments/xmlwriter.h | 10 +- .../doc/snippets/textdocument-blocks/main.cpp | 10 +- .../textdocument-blocks/mainwindow.cpp | 10 +- .../snippets/textdocument-blocks/mainwindow.h | 10 +- .../textdocument-blocks/xmlwriter.cpp | 10 +- .../snippets/textdocument-blocks/xmlwriter.h | 10 +- .../textdocument-charformats/main.cpp | 10 +- .../doc/snippets/textdocument-css/main.cpp | 10 +- .../snippets/textdocument-cursors/main.cpp | 10 +- .../doc/snippets/textdocument-find/main.cpp | 10 +- .../doc/snippets/textdocument-frames/main.cpp | 10 +- .../textdocument-frames/mainwindow.cpp | 10 +- .../snippets/textdocument-frames/mainwindow.h | 10 +- .../textdocument-frames/xmlwriter.cpp | 10 +- .../snippets/textdocument-frames/xmlwriter.h | 10 +- .../snippets/textdocument-imagedrop/main.cpp | 10 +- .../textdocument-imagedrop/textedit.h | 10 +- .../textdocument-imageformat/main.cpp | 10 +- .../doc/snippets/textdocument-images/main.cpp | 10 +- .../snippets/textdocument-listitems/main.cpp | 10 +- .../textdocument-listitems/mainwindow.cpp | 10 +- .../textdocument-listitems/mainwindow.h | 10 +- .../textdocument-listitemstyles/main.cpp | 10 +- .../mainwindow.cpp | 10 +- .../textdocument-listitemstyles/mainwindow.h | 10 +- .../textdocument-lists/mainwindow.cpp | 10 +- .../snippets/textdocument-printing/main.cpp | 10 +- .../textdocument-printing/mainwindow.cpp | 10 +- .../textdocument-printing/mainwindow.h | 10 +- .../snippets/textdocument-resources/main.cpp | 10 +- .../snippets/textdocument-selections/main.cpp | 10 +- .../textdocument-selections/mainwindow.cpp | 10 +- .../textdocument-selections/mainwindow.h | 10 +- .../doc/snippets/textdocument-tables/main.cpp | 10 +- .../textdocument-tables/mainwindow.cpp | 10 +- .../snippets/textdocument-tables/mainwindow.h | 10 +- .../textdocument-tables/xmlwriter.cpp | 10 +- .../snippets/textdocument-tables/xmlwriter.h | 10 +- .../snippets/textdocument-texttable/main.cpp | 10 +- .../doc/snippets/textdocumentendsnippet.cpp | 10 +- src/gui/doc/snippets/transform/main.cpp | 10 +- src/gui/doc/src/coordsys.qdoc | 12 +- src/gui/doc/src/dnd.qdoc | 12 +- src/gui/doc/src/external-resources.qdoc | 12 +- src/gui/doc/src/paintsystem.qdoc | 12 +- src/gui/doc/src/qtgui.qdoc | 12 +- src/gui/doc/src/richtext.qdoc | 12 +- src/gui/image/qbitmap.cpp | 14 +- src/gui/image/qbitmap.h | 14 +- src/gui/image/qbmphandler.cpp | 14 +- src/gui/image/qbmphandler_p.h | 14 +- src/gui/image/qgifhandler.cpp | 14 +- src/gui/image/qgifhandler_p.h | 14 +- src/gui/image/qicon.cpp | 14 +- src/gui/image/qicon.h | 14 +- src/gui/image/qicon_p.h | 14 +- src/gui/image/qiconengine.cpp | 14 +- src/gui/image/qiconengine.h | 14 +- src/gui/image/qiconengineplugin.cpp | 14 +- src/gui/image/qiconengineplugin.h | 14 +- src/gui/image/qiconloader.cpp | 14 +- src/gui/image/qiconloader_p.h | 14 +- src/gui/image/qimage.cpp | 14 +- src/gui/image/qimage.h | 14 +- src/gui/image/qimage_compat.cpp | 14 +- src/gui/image/qimage_conversions.cpp | 14 +- src/gui/image/qimage_mips_dspr2.cpp | 12 +- src/gui/image/qimage_mips_dspr2_asm.S | 34 ++- src/gui/image/qimage_neon.cpp | 14 +- src/gui/image/qimage_p.h | 14 +- src/gui/image/qimage_sse2.cpp | 14 +- src/gui/image/qimage_ssse3.cpp | 14 +- src/gui/image/qimageiohandler.cpp | 14 +- src/gui/image/qimageiohandler.h | 14 +- src/gui/image/qimagepixmapcleanuphooks.cpp | 14 +- src/gui/image/qimagepixmapcleanuphooks_p.h | 14 +- src/gui/image/qimagereader.cpp | 14 +- src/gui/image/qimagereader.h | 14 +- src/gui/image/qimagewriter.cpp | 14 +- src/gui/image/qimagewriter.h | 14 +- src/gui/image/qjpeghandler.cpp | 14 +- src/gui/image/qjpeghandler_p.h | 14 +- src/gui/image/qmovie.cpp | 14 +- src/gui/image/qmovie.h | 14 +- src/gui/image/qnativeimage.cpp | 14 +- src/gui/image/qnativeimage_p.h | 14 +- src/gui/image/qpaintengine_pic.cpp | 14 +- src/gui/image/qpaintengine_pic_p.h | 14 +- src/gui/image/qpicture.cpp | 14 +- src/gui/image/qpicture.h | 14 +- src/gui/image/qpicture_p.h | 14 +- src/gui/image/qpictureformatplugin.cpp | 14 +- src/gui/image/qpictureformatplugin.h | 14 +- src/gui/image/qpixmap.cpp | 14 +- src/gui/image/qpixmap.h | 14 +- src/gui/image/qpixmap_blitter.cpp | 14 +- src/gui/image/qpixmap_blitter_p.h | 14 +- src/gui/image/qpixmap_raster.cpp | 14 +- src/gui/image/qpixmap_raster_p.h | 14 +- src/gui/image/qpixmap_win.cpp | 14 +- src/gui/image/qpixmapcache.cpp | 14 +- src/gui/image/qpixmapcache.h | 14 +- src/gui/image/qpixmapcache_p.h | 14 +- src/gui/image/qplatformpixmap.cpp | 14 +- src/gui/image/qplatformpixmap.h | 14 +- src/gui/image/qpnghandler.cpp | 14 +- src/gui/image/qpnghandler_p.h | 14 +- src/gui/image/qppmhandler.cpp | 14 +- src/gui/image/qppmhandler_p.h | 14 +- src/gui/image/qxbmhandler.cpp | 14 +- src/gui/image/qxbmhandler_p.h | 14 +- src/gui/image/qxpmhandler.cpp | 14 +- src/gui/image/qxpmhandler_p.h | 14 +- src/gui/itemmodels/qstandarditemmodel.cpp | 14 +- src/gui/itemmodels/qstandarditemmodel.h | 14 +- src/gui/itemmodels/qstandarditemmodel_p.h | 14 +- src/gui/kernel/qclipboard.cpp | 14 +- src/gui/kernel/qclipboard.h | 14 +- src/gui/kernel/qcursor.cpp | 14 +- src/gui/kernel/qcursor.h | 14 +- src/gui/kernel/qcursor_p.h | 14 +- src/gui/kernel/qdnd.cpp | 14 +- src/gui/kernel/qdnd_p.h | 14 +- src/gui/kernel/qdrag.cpp | 14 +- src/gui/kernel/qdrag.h | 14 +- src/gui/kernel/qevent.cpp | 14 +- src/gui/kernel/qevent.h | 14 +- src/gui/kernel/qevent_p.h | 14 +- src/gui/kernel/qgenericplugin.cpp | 14 +- src/gui/kernel/qgenericplugin.h | 14 +- src/gui/kernel/qgenericpluginfactory.cpp | 14 +- src/gui/kernel/qgenericpluginfactory.h | 14 +- src/gui/kernel/qguiapplication.cpp | 14 +- src/gui/kernel/qguiapplication.h | 14 +- src/gui/kernel/qguiapplication_p.h | 14 +- src/gui/kernel/qguivariant.cpp | 14 +- src/gui/kernel/qinputdevicemanager.cpp | 14 +- src/gui/kernel/qinputdevicemanager_p.h | 14 +- src/gui/kernel/qinputdevicemanager_p_p.h | 14 +- src/gui/kernel/qinputmethod.cpp | 14 +- src/gui/kernel/qinputmethod.h | 14 +- src/gui/kernel/qinputmethod_p.h | 14 +- src/gui/kernel/qkeymapper.cpp | 14 +- src/gui/kernel/qkeymapper_p.h | 14 +- src/gui/kernel/qkeysequence.cpp | 14 +- src/gui/kernel/qkeysequence.h | 14 +- src/gui/kernel/qkeysequence_p.h | 14 +- src/gui/kernel/qoffscreensurface.cpp | 14 +- src/gui/kernel/qoffscreensurface.h | 14 +- src/gui/kernel/qopenglcontext.cpp | 14 +- src/gui/kernel/qopenglcontext.h | 14 +- src/gui/kernel/qopenglcontext_p.h | 14 +- src/gui/kernel/qopenglwindow.cpp | 14 +- src/gui/kernel/qopenglwindow.h | 14 +- src/gui/kernel/qpaintdevicewindow.cpp | 14 +- src/gui/kernel/qpaintdevicewindow.h | 14 +- src/gui/kernel/qpaintdevicewindow_p.h | 14 +- src/gui/kernel/qpalette.cpp | 14 +- src/gui/kernel/qpalette.h | 14 +- src/gui/kernel/qpixelformat.cpp | 14 +- src/gui/kernel/qpixelformat.h | 14 +- src/gui/kernel/qplatformclipboard.cpp | 14 +- src/gui/kernel/qplatformclipboard.h | 14 +- src/gui/kernel/qplatformcursor.cpp | 14 +- src/gui/kernel/qplatformcursor.h | 14 +- src/gui/kernel/qplatformdialoghelper.cpp | 14 +- src/gui/kernel/qplatformdialoghelper.h | 14 +- src/gui/kernel/qplatformdrag.cpp | 14 +- src/gui/kernel/qplatformdrag.h | 14 +- src/gui/kernel/qplatformgraphicsbuffer.cpp | 36 ++- src/gui/kernel/qplatformgraphicsbuffer.h | 36 ++- .../kernel/qplatformgraphicsbufferhelper.cpp | 36 ++- .../kernel/qplatformgraphicsbufferhelper.h | 38 ++- src/gui/kernel/qplatforminputcontext.cpp | 14 +- src/gui/kernel/qplatforminputcontext.h | 14 +- src/gui/kernel/qplatforminputcontext_p.h | 14 +- .../kernel/qplatforminputcontextfactory.cpp | 14 +- .../kernel/qplatforminputcontextfactory_p.h | 14 +- .../kernel/qplatforminputcontextplugin.cpp | 14 +- .../kernel/qplatforminputcontextplugin_p.h | 14 +- src/gui/kernel/qplatformintegration.cpp | 14 +- src/gui/kernel/qplatformintegration.h | 14 +- .../kernel/qplatformintegrationfactory.cpp | 14 +- .../kernel/qplatformintegrationfactory_p.h | 14 +- src/gui/kernel/qplatformintegrationplugin.cpp | 14 +- src/gui/kernel/qplatformintegrationplugin.h | 14 +- src/gui/kernel/qplatformmenu.cpp | 14 +- src/gui/kernel/qplatformmenu.h | 14 +- src/gui/kernel/qplatformnativeinterface.cpp | 14 +- src/gui/kernel/qplatformnativeinterface.h | 14 +- src/gui/kernel/qplatformoffscreensurface.cpp | 14 +- src/gui/kernel/qplatformoffscreensurface.h | 14 +- src/gui/kernel/qplatformopenglcontext.cpp | 14 +- src/gui/kernel/qplatformopenglcontext.h | 14 +- src/gui/kernel/qplatformscreen.cpp | 14 +- src/gui/kernel/qplatformscreen.h | 14 +- src/gui/kernel/qplatformscreen_p.h | 14 +- src/gui/kernel/qplatformservices.cpp | 14 +- src/gui/kernel/qplatformservices.h | 14 +- src/gui/kernel/qplatformsessionmanager.cpp | 14 +- src/gui/kernel/qplatformsessionmanager.h | 14 +- .../kernel/qplatformsharedgraphicscache.cpp | 14 +- src/gui/kernel/qplatformsharedgraphicscache.h | 14 +- src/gui/kernel/qplatformsurface.cpp | 14 +- src/gui/kernel/qplatformsurface.h | 14 +- src/gui/kernel/qplatformsystemtrayicon.cpp | 14 +- src/gui/kernel/qplatformsystemtrayicon.h | 14 +- src/gui/kernel/qplatformtheme.cpp | 14 +- src/gui/kernel/qplatformtheme.h | 14 +- src/gui/kernel/qplatformtheme_p.h | 14 +- src/gui/kernel/qplatformthemefactory.cpp | 14 +- src/gui/kernel/qplatformthemefactory_p.h | 14 +- src/gui/kernel/qplatformthemeplugin.cpp | 14 +- src/gui/kernel/qplatformthemeplugin.h | 14 +- src/gui/kernel/qplatformwindow.cpp | 14 +- src/gui/kernel/qplatformwindow.h | 14 +- src/gui/kernel/qplatformwindow_p.h | 14 +- src/gui/kernel/qrasterwindow.cpp | 14 +- src/gui/kernel/qrasterwindow.h | 14 +- src/gui/kernel/qscreen.cpp | 14 +- src/gui/kernel/qscreen.h | 14 +- src/gui/kernel/qscreen_p.h | 14 +- src/gui/kernel/qsessionmanager.cpp | 14 +- src/gui/kernel/qsessionmanager.h | 14 +- src/gui/kernel/qsessionmanager_p.h | 14 +- src/gui/kernel/qshapedpixmapdndwindow.cpp | 14 +- src/gui/kernel/qshapedpixmapdndwindow_p.h | 14 +- src/gui/kernel/qshortcutmap.cpp | 14 +- src/gui/kernel/qshortcutmap_p.h | 14 +- src/gui/kernel/qsimpledrag.cpp | 14 +- src/gui/kernel/qsimpledrag_p.h | 14 +- src/gui/kernel/qstylehints.cpp | 14 +- src/gui/kernel/qstylehints.h | 14 +- src/gui/kernel/qsurface.cpp | 14 +- src/gui/kernel/qsurface.h | 14 +- src/gui/kernel/qsurfaceformat.cpp | 14 +- src/gui/kernel/qsurfaceformat.h | 14 +- src/gui/kernel/qt_gui_pch.h | 14 +- src/gui/kernel/qtouchdevice.cpp | 14 +- src/gui/kernel/qtouchdevice.h | 14 +- src/gui/kernel/qtouchdevice_p.h | 14 +- src/gui/kernel/qwindow.cpp | 14 +- src/gui/kernel/qwindow.h | 14 +- src/gui/kernel/qwindow_p.h | 14 +- src/gui/kernel/qwindowdefs.h | 14 +- src/gui/kernel/qwindowdefs_win.h | 14 +- src/gui/kernel/qwindowsysteminterface.cpp | 14 +- src/gui/kernel/qwindowsysteminterface.h | 14 +- src/gui/kernel/qwindowsysteminterface_p.h | 14 +- src/gui/math3d/qgenericmatrix.cpp | 14 +- src/gui/math3d/qgenericmatrix.h | 14 +- src/gui/math3d/qmatrix4x4.cpp | 14 +- src/gui/math3d/qmatrix4x4.h | 14 +- src/gui/math3d/qquaternion.cpp | 14 +- src/gui/math3d/qquaternion.h | 14 +- src/gui/math3d/qvector2d.cpp | 14 +- src/gui/math3d/qvector2d.h | 14 +- src/gui/math3d/qvector3d.cpp | 14 +- src/gui/math3d/qvector3d.h | 14 +- src/gui/math3d/qvector4d.cpp | 14 +- src/gui/math3d/qvector4d.h | 14 +- src/gui/opengl/qopengl.cpp | 14 +- src/gui/opengl/qopengl.h | 14 +- src/gui/opengl/qopengl2pexvertexarray.cpp | 14 +- src/gui/opengl/qopengl2pexvertexarray_p.h | 14 +- src/gui/opengl/qopengl_p.h | 14 +- src/gui/opengl/qopenglbuffer.cpp | 14 +- src/gui/opengl/qopenglbuffer.h | 14 +- src/gui/opengl/qopenglcustomshaderstage.cpp | 14 +- src/gui/opengl/qopenglcustomshaderstage_p.h | 14 +- src/gui/opengl/qopengldebug.cpp | 12 +- src/gui/opengl/qopengldebug.h | 12 +- src/gui/opengl/qopenglengineshadermanager.cpp | 14 +- src/gui/opengl/qopenglengineshadermanager_p.h | 14 +- src/gui/opengl/qopenglengineshadersource_p.h | 14 +- src/gui/opengl/qopenglextensions_p.h | 14 +- src/gui/opengl/qopenglframebufferobject.cpp | 14 +- src/gui/opengl/qopenglframebufferobject.h | 14 +- src/gui/opengl/qopenglframebufferobject_p.h | 14 +- src/gui/opengl/qopenglfunctions.cpp | 14 +- src/gui/opengl/qopenglfunctions.h | 14 +- src/gui/opengl/qopenglfunctions_1_0.cpp | 12 +- src/gui/opengl/qopenglfunctions_1_0.h | 12 +- src/gui/opengl/qopenglfunctions_1_1.cpp | 12 +- src/gui/opengl/qopenglfunctions_1_1.h | 12 +- src/gui/opengl/qopenglfunctions_1_2.cpp | 12 +- src/gui/opengl/qopenglfunctions_1_2.h | 12 +- src/gui/opengl/qopenglfunctions_1_3.cpp | 12 +- src/gui/opengl/qopenglfunctions_1_3.h | 12 +- src/gui/opengl/qopenglfunctions_1_4.cpp | 12 +- src/gui/opengl/qopenglfunctions_1_4.h | 12 +- src/gui/opengl/qopenglfunctions_1_5.cpp | 12 +- src/gui/opengl/qopenglfunctions_1_5.h | 12 +- src/gui/opengl/qopenglfunctions_2_0.cpp | 12 +- src/gui/opengl/qopenglfunctions_2_0.h | 12 +- src/gui/opengl/qopenglfunctions_2_1.cpp | 12 +- src/gui/opengl/qopenglfunctions_2_1.h | 12 +- src/gui/opengl/qopenglfunctions_3_0.cpp | 12 +- src/gui/opengl/qopenglfunctions_3_0.h | 12 +- src/gui/opengl/qopenglfunctions_3_1.cpp | 12 +- src/gui/opengl/qopenglfunctions_3_1.h | 12 +- .../qopenglfunctions_3_2_compatibility.cpp | 12 +- .../qopenglfunctions_3_2_compatibility.h | 12 +- src/gui/opengl/qopenglfunctions_3_2_core.cpp | 12 +- src/gui/opengl/qopenglfunctions_3_2_core.h | 12 +- .../qopenglfunctions_3_3_compatibility.cpp | 12 +- .../qopenglfunctions_3_3_compatibility.h | 12 +- src/gui/opengl/qopenglfunctions_3_3_core.cpp | 12 +- src/gui/opengl/qopenglfunctions_3_3_core.h | 12 +- .../qopenglfunctions_4_0_compatibility.cpp | 12 +- .../qopenglfunctions_4_0_compatibility.h | 12 +- src/gui/opengl/qopenglfunctions_4_0_core.cpp | 12 +- src/gui/opengl/qopenglfunctions_4_0_core.h | 12 +- .../qopenglfunctions_4_1_compatibility.cpp | 12 +- .../qopenglfunctions_4_1_compatibility.h | 12 +- src/gui/opengl/qopenglfunctions_4_1_core.cpp | 12 +- src/gui/opengl/qopenglfunctions_4_1_core.h | 12 +- .../qopenglfunctions_4_2_compatibility.cpp | 12 +- .../qopenglfunctions_4_2_compatibility.h | 12 +- src/gui/opengl/qopenglfunctions_4_2_core.cpp | 12 +- src/gui/opengl/qopenglfunctions_4_2_core.h | 12 +- .../qopenglfunctions_4_3_compatibility.cpp | 12 +- .../qopenglfunctions_4_3_compatibility.h | 12 +- src/gui/opengl/qopenglfunctions_4_3_core.cpp | 12 +- src/gui/opengl/qopenglfunctions_4_3_core.h | 12 +- .../qopenglfunctions_4_4_compatibility.cpp | 12 +- .../qopenglfunctions_4_4_compatibility.h | 12 +- src/gui/opengl/qopenglfunctions_4_4_core.cpp | 12 +- src/gui/opengl/qopenglfunctions_4_4_core.h | 12 +- .../qopenglfunctions_4_5_compatibility.cpp | 12 +- .../qopenglfunctions_4_5_compatibility.h | 12 +- src/gui/opengl/qopenglfunctions_4_5_core.cpp | 12 +- src/gui/opengl/qopenglfunctions_4_5_core.h | 12 +- src/gui/opengl/qopenglfunctions_es2.cpp | 12 +- src/gui/opengl/qopenglfunctions_es2.h | 12 +- src/gui/opengl/qopenglgradientcache.cpp | 14 +- src/gui/opengl/qopenglgradientcache_p.h | 14 +- src/gui/opengl/qopenglpaintdevice.cpp | 14 +- src/gui/opengl/qopenglpaintdevice.h | 14 +- src/gui/opengl/qopenglpaintdevice_p.h | 14 +- src/gui/opengl/qopenglpaintengine.cpp | 14 +- src/gui/opengl/qopenglpaintengine_p.h | 14 +- .../opengl/qopenglpixeltransferoptions.cpp | 12 +- src/gui/opengl/qopenglpixeltransferoptions.h | 12 +- src/gui/opengl/qopenglqueryhelper_p.h | 12 +- src/gui/opengl/qopenglshadercache_meego_p.h | 14 +- src/gui/opengl/qopenglshadercache_p.h | 14 +- src/gui/opengl/qopenglshaderprogram.cpp | 14 +- src/gui/opengl/qopenglshaderprogram.h | 14 +- src/gui/opengl/qopengltexture.cpp | 12 +- src/gui/opengl/qopengltexture.h | 12 +- src/gui/opengl/qopengltexture_p.h | 12 +- src/gui/opengl/qopengltextureblitter.cpp | 14 +- src/gui/opengl/qopengltextureblitter_p.h | 14 +- src/gui/opengl/qopengltexturecache.cpp | 14 +- src/gui/opengl/qopengltexturecache_p.h | 14 +- src/gui/opengl/qopengltextureglyphcache.cpp | 14 +- src/gui/opengl/qopengltextureglyphcache_p.h | 14 +- src/gui/opengl/qopengltexturehelper.cpp | 12 +- src/gui/opengl/qopengltexturehelper_p.h | 12 +- src/gui/opengl/qopengltimerquery.cpp | 12 +- src/gui/opengl/qopengltimerquery.h | 12 +- src/gui/opengl/qopenglversionfunctions.cpp | 12 +- src/gui/opengl/qopenglversionfunctions.h | 12 +- .../opengl/qopenglversionfunctionsfactory.cpp | 12 +- .../opengl/qopenglversionfunctionsfactory_p.h | 12 +- src/gui/opengl/qopenglvertexarrayobject.cpp | 12 +- src/gui/opengl/qopenglvertexarrayobject.h | 12 +- src/gui/opengl/qopenglvertexarrayobject_p.h | 12 +- src/gui/opengl/qrbtree_p.h | 14 +- src/gui/opengl/qtriangulatingstroker.cpp | 14 +- src/gui/opengl/qtriangulatingstroker_p.h | 14 +- src/gui/opengl/qtriangulator.cpp | 14 +- src/gui/opengl/qtriangulator_p.h | 14 +- src/gui/painting/qbackingstore.cpp | 14 +- src/gui/painting/qbackingstore.h | 14 +- src/gui/painting/qbezier.cpp | 14 +- src/gui/painting/qbezier_p.h | 14 +- src/gui/painting/qblendfunctions.cpp | 14 +- src/gui/painting/qblendfunctions_p.h | 14 +- src/gui/painting/qblittable.cpp | 14 +- src/gui/painting/qblittable_p.h | 14 +- src/gui/painting/qbrush.cpp | 14 +- src/gui/painting/qbrush.h | 14 +- src/gui/painting/qcolor.cpp | 14 +- src/gui/painting/qcolor.h | 14 +- src/gui/painting/qcolor_p.cpp | 14 +- src/gui/painting/qcolor_p.h | 14 +- src/gui/painting/qcosmeticstroker.cpp | 14 +- src/gui/painting/qcosmeticstroker_p.h | 14 +- src/gui/painting/qcssutil.cpp | 14 +- src/gui/painting/qcssutil_p.h | 14 +- src/gui/painting/qdatabuffer_p.h | 14 +- src/gui/painting/qdrawhelper.cpp | 14 +- src/gui/painting/qdrawhelper_mips_dsp.cpp | 12 +- src/gui/painting/qdrawhelper_mips_dsp_asm.S | 34 ++- src/gui/painting/qdrawhelper_mips_dsp_p.h | 12 +- src/gui/painting/qdrawhelper_mips_dspr2_asm.S | 34 ++- src/gui/painting/qdrawhelper_neon.cpp | 14 +- src/gui/painting/qdrawhelper_neon_asm.S | 36 ++- src/gui/painting/qdrawhelper_neon_p.h | 14 +- src/gui/painting/qdrawhelper_p.h | 14 +- src/gui/painting/qdrawhelper_sse2.cpp | 14 +- src/gui/painting/qdrawhelper_ssse3.cpp | 14 +- src/gui/painting/qdrawhelper_x86_p.h | 14 +- src/gui/painting/qdrawingprimitive_sse2_p.h | 14 +- src/gui/painting/qemulationpaintengine.cpp | 14 +- src/gui/painting/qemulationpaintengine_p.h | 14 +- src/gui/painting/qfixed_p.h | 14 +- src/gui/painting/qgammatables.cpp | 14 +- src/gui/painting/qgrayraster.c | 14 +- src/gui/painting/qgrayraster_p.h | 14 +- src/gui/painting/qimagescale.cpp | 14 +- src/gui/painting/qimagescale_p.h | 14 +- src/gui/painting/qmath_p.h | 14 +- src/gui/painting/qmatrix.cpp | 14 +- src/gui/painting/qmatrix.h | 14 +- src/gui/painting/qmemrotate.cpp | 14 +- src/gui/painting/qmemrotate_p.h | 14 +- src/gui/painting/qoutlinemapper.cpp | 14 +- src/gui/painting/qoutlinemapper_p.h | 14 +- src/gui/painting/qpagedpaintdevice.cpp | 14 +- src/gui/painting/qpagedpaintdevice.h | 14 +- src/gui/painting/qpagedpaintdevice_p.h | 14 +- src/gui/painting/qpagelayout.cpp | 12 +- src/gui/painting/qpagelayout.h | 12 +- src/gui/painting/qpagesize.cpp | 12 +- src/gui/painting/qpagesize.h | 12 +- src/gui/painting/qpaintdevice.cpp | 14 +- src/gui/painting/qpaintdevice.h | 14 +- src/gui/painting/qpaintdevice.qdoc | 12 +- src/gui/painting/qpaintengine.cpp | 14 +- src/gui/painting/qpaintengine.h | 14 +- src/gui/painting/qpaintengine_blitter.cpp | 14 +- src/gui/painting/qpaintengine_blitter_p.h | 14 +- src/gui/painting/qpaintengine_p.h | 14 +- src/gui/painting/qpaintengine_raster.cpp | 14 +- src/gui/painting/qpaintengine_raster_p.h | 14 +- src/gui/painting/qpaintengineex.cpp | 14 +- src/gui/painting/qpaintengineex_p.h | 14 +- src/gui/painting/qpainter.cpp | 14 +- src/gui/painting/qpainter.h | 14 +- src/gui/painting/qpainter_p.h | 14 +- src/gui/painting/qpainterpath.cpp | 14 +- src/gui/painting/qpainterpath.h | 14 +- src/gui/painting/qpainterpath_p.h | 14 +- src/gui/painting/qpathclipper.cpp | 14 +- src/gui/painting/qpathclipper_p.h | 14 +- src/gui/painting/qpathsimplifier.cpp | 14 +- src/gui/painting/qpathsimplifier_p.h | 14 +- src/gui/painting/qpdf.cpp | 14 +- src/gui/painting/qpdf_p.h | 14 +- src/gui/painting/qpdfwriter.cpp | 14 +- src/gui/painting/qpdfwriter.h | 14 +- src/gui/painting/qpen.cpp | 14 +- src/gui/painting/qpen.h | 14 +- src/gui/painting/qpen_p.h | 14 +- src/gui/painting/qplatformbackingstore.cpp | 14 +- src/gui/painting/qplatformbackingstore.h | 14 +- src/gui/painting/qpolygon.cpp | 14 +- src/gui/painting/qpolygon.h | 14 +- src/gui/painting/qpolygonclipper_p.h | 14 +- src/gui/painting/qrasterdefs_p.h | 14 +- src/gui/painting/qrasterizer.cpp | 14 +- src/gui/painting/qrasterizer_p.h | 14 +- src/gui/painting/qregion.cpp | 14 +- src/gui/painting/qregion.h | 14 +- src/gui/painting/qrgb.h | 14 +- src/gui/painting/qstroker.cpp | 14 +- src/gui/painting/qstroker_p.h | 14 +- src/gui/painting/qt_mips_asm_dsp_p.h | 12 +- src/gui/painting/qtextureglyphcache.cpp | 14 +- src/gui/painting/qtextureglyphcache_p.h | 14 +- src/gui/painting/qtransform.cpp | 14 +- src/gui/painting/qtransform.h | 14 +- src/gui/painting/qvectorpath_p.h | 14 +- src/gui/text/qabstracttextdocumentlayout.cpp | 14 +- src/gui/text/qabstracttextdocumentlayout.h | 14 +- src/gui/text/qabstracttextdocumentlayout_p.h | 14 +- src/gui/text/qcssparser.cpp | 14 +- src/gui/text/qcssparser_p.h | 14 +- src/gui/text/qcssscanner.cpp | 14 +- src/gui/text/qdistancefield.cpp | 14 +- src/gui/text/qdistancefield_p.h | 14 +- src/gui/text/qfont.cpp | 14 +- src/gui/text/qfont.h | 14 +- src/gui/text/qfont_p.h | 14 +- src/gui/text/qfontdatabase.cpp | 14 +- src/gui/text/qfontdatabase.h | 14 +- src/gui/text/qfontengine.cpp | 14 +- src/gui/text/qfontengine_ft.cpp | 14 +- src/gui/text/qfontengine_ft_p.h | 14 +- src/gui/text/qfontengine_p.h | 14 +- src/gui/text/qfontengine_qpf2.cpp | 14 +- src/gui/text/qfontengine_qpf2_p.h | 14 +- src/gui/text/qfontengineglyphcache_p.h | 14 +- src/gui/text/qfontinfo.h | 14 +- src/gui/text/qfontmetrics.cpp | 14 +- src/gui/text/qfontmetrics.h | 14 +- src/gui/text/qfontsubset.cpp | 14 +- src/gui/text/qfontsubset_agl.cpp | 14 +- src/gui/text/qfontsubset_p.h | 14 +- src/gui/text/qfragmentmap.cpp | 14 +- src/gui/text/qfragmentmap_p.h | 14 +- src/gui/text/qglyphrun.cpp | 14 +- src/gui/text/qglyphrun.h | 14 +- src/gui/text/qglyphrun_p.h | 14 +- src/gui/text/qharfbuzzng.cpp | 14 +- src/gui/text/qharfbuzzng_p.h | 14 +- src/gui/text/qplatformfontdatabase.cpp | 14 +- src/gui/text/qplatformfontdatabase.h | 14 +- src/gui/text/qrawfont.cpp | 14 +- src/gui/text/qrawfont.h | 14 +- src/gui/text/qrawfont_p.h | 14 +- src/gui/text/qstatictext.cpp | 14 +- src/gui/text/qstatictext.h | 14 +- src/gui/text/qstatictext_p.h | 14 +- src/gui/text/qsyntaxhighlighter.cpp | 14 +- src/gui/text/qsyntaxhighlighter.h | 14 +- src/gui/text/qtextcursor.cpp | 14 +- src/gui/text/qtextcursor.h | 14 +- src/gui/text/qtextcursor_p.h | 14 +- src/gui/text/qtextdocument.cpp | 14 +- src/gui/text/qtextdocument.h | 14 +- src/gui/text/qtextdocument_p.cpp | 14 +- src/gui/text/qtextdocument_p.h | 14 +- src/gui/text/qtextdocumentfragment.cpp | 14 +- src/gui/text/qtextdocumentfragment.h | 14 +- src/gui/text/qtextdocumentfragment_p.h | 14 +- src/gui/text/qtextdocumentlayout.cpp | 14 +- src/gui/text/qtextdocumentlayout_p.h | 14 +- src/gui/text/qtextdocumentwriter.cpp | 14 +- src/gui/text/qtextdocumentwriter.h | 14 +- src/gui/text/qtextengine.cpp | 14 +- src/gui/text/qtextengine_p.h | 14 +- src/gui/text/qtextformat.cpp | 14 +- src/gui/text/qtextformat.h | 14 +- src/gui/text/qtextformat_p.h | 14 +- src/gui/text/qtexthtmlparser.cpp | 14 +- src/gui/text/qtexthtmlparser_p.h | 14 +- src/gui/text/qtextimagehandler.cpp | 14 +- src/gui/text/qtextimagehandler_p.h | 14 +- src/gui/text/qtextlayout.cpp | 14 +- src/gui/text/qtextlayout.h | 14 +- src/gui/text/qtextlist.cpp | 14 +- src/gui/text/qtextlist.h | 14 +- src/gui/text/qtextobject.cpp | 14 +- src/gui/text/qtextobject.h | 14 +- src/gui/text/qtextobject_p.h | 14 +- src/gui/text/qtextodfwriter.cpp | 14 +- src/gui/text/qtextodfwriter_p.h | 14 +- src/gui/text/qtextoption.cpp | 14 +- src/gui/text/qtextoption.h | 14 +- src/gui/text/qtexttable.cpp | 14 +- src/gui/text/qtexttable.h | 14 +- src/gui/text/qtexttable_p.h | 14 +- src/gui/text/qzip.cpp | 14 +- src/gui/text/qzipreader_p.h | 14 +- src/gui/text/qzipwriter_p.h | 14 +- src/gui/util/qabstractlayoutstyleinfo.cpp | 14 +- src/gui/util/qabstractlayoutstyleinfo_p.h | 14 +- src/gui/util/qdesktopservices.cpp | 14 +- src/gui/util/qdesktopservices.h | 14 +- src/gui/util/qgridlayoutengine.cpp | 14 +- src/gui/util/qgridlayoutengine_p.h | 14 +- src/gui/util/qhexstring_p.h | 14 +- src/gui/util/qlayoutpolicy.cpp | 14 +- src/gui/util/qlayoutpolicy_p.h | 14 +- src/gui/util/qvalidator.cpp | 14 +- src/gui/util/qvalidator.h | 14 +- src/network/access/qabstractnetworkcache.cpp | 14 +- src/network/access/qabstractnetworkcache.h | 14 +- src/network/access/qabstractnetworkcache_p.h | 14 +- .../access/qabstractprotocolhandler.cpp | 12 +- .../access/qabstractprotocolhandler_p.h | 12 +- src/network/access/qftp.cpp | 14 +- src/network/access/qftp_p.h | 14 +- src/network/access/qhttpmultipart.cpp | 14 +- src/network/access/qhttpmultipart.h | 14 +- src/network/access/qhttpmultipart_p.h | 14 +- src/network/access/qhttpnetworkconnection.cpp | 14 +- src/network/access/qhttpnetworkconnection_p.h | 14 +- .../access/qhttpnetworkconnectionchannel.cpp | 14 +- .../access/qhttpnetworkconnectionchannel_p.h | 14 +- src/network/access/qhttpnetworkheader.cpp | 14 +- src/network/access/qhttpnetworkheader_p.h | 14 +- src/network/access/qhttpnetworkreply.cpp | 14 +- src/network/access/qhttpnetworkreply_p.h | 14 +- src/network/access/qhttpnetworkrequest.cpp | 14 +- src/network/access/qhttpnetworkrequest_p.h | 14 +- src/network/access/qhttpprotocolhandler.cpp | 14 +- src/network/access/qhttpprotocolhandler_p.h | 14 +- src/network/access/qhttpthreaddelegate.cpp | 14 +- src/network/access/qhttpthreaddelegate_p.h | 14 +- .../qnetworkaccessauthenticationmanager.cpp | 14 +- .../qnetworkaccessauthenticationmanager_p.h | 14 +- src/network/access/qnetworkaccessbackend.cpp | 14 +- src/network/access/qnetworkaccessbackend_p.h | 14 +- src/network/access/qnetworkaccesscache.cpp | 14 +- src/network/access/qnetworkaccesscache_p.h | 14 +- .../access/qnetworkaccesscachebackend.cpp | 14 +- .../access/qnetworkaccesscachebackend_p.h | 14 +- .../access/qnetworkaccessdebugpipebackend.cpp | 14 +- .../access/qnetworkaccessdebugpipebackend_p.h | 14 +- .../access/qnetworkaccessfilebackend.cpp | 14 +- .../access/qnetworkaccessfilebackend_p.h | 14 +- .../access/qnetworkaccessftpbackend.cpp | 14 +- .../access/qnetworkaccessftpbackend_p.h | 14 +- src/network/access/qnetworkaccessmanager.cpp | 14 +- src/network/access/qnetworkaccessmanager.h | 14 +- src/network/access/qnetworkaccessmanager_p.h | 14 +- src/network/access/qnetworkcookie.cpp | 14 +- src/network/access/qnetworkcookie.h | 14 +- src/network/access/qnetworkcookie_p.h | 14 +- src/network/access/qnetworkcookiejar.cpp | 14 +- src/network/access/qnetworkcookiejar.h | 14 +- src/network/access/qnetworkcookiejar_p.h | 14 +- src/network/access/qnetworkdiskcache.cpp | 14 +- src/network/access/qnetworkdiskcache.h | 14 +- src/network/access/qnetworkdiskcache_p.h | 14 +- src/network/access/qnetworkreply.cpp | 14 +- src/network/access/qnetworkreply.h | 14 +- src/network/access/qnetworkreply_p.h | 14 +- src/network/access/qnetworkreplydataimpl.cpp | 14 +- src/network/access/qnetworkreplydataimpl_p.h | 14 +- src/network/access/qnetworkreplyfileimpl.cpp | 14 +- src/network/access/qnetworkreplyfileimpl_p.h | 14 +- src/network/access/qnetworkreplyhttpimpl.cpp | 14 +- src/network/access/qnetworkreplyhttpimpl_p.h | 14 +- src/network/access/qnetworkreplyimpl.cpp | 14 +- src/network/access/qnetworkreplyimpl_p.h | 14 +- .../qnetworkreplynsurlconnectionimpl.mm | 36 ++- .../qnetworkreplynsurlconnectionimpl_p.h | 14 +- src/network/access/qnetworkrequest.cpp | 14 +- src/network/access/qnetworkrequest.h | 14 +- src/network/access/qnetworkrequest_p.h | 14 +- src/network/access/qspdyprotocolhandler.cpp | 14 +- src/network/access/qspdyprotocolhandler_p.h | 12 +- src/network/bearer/qbearerengine.cpp | 14 +- src/network/bearer/qbearerengine_p.h | 14 +- src/network/bearer/qbearerplugin.cpp | 14 +- src/network/bearer/qbearerplugin_p.h | 14 +- src/network/bearer/qnetworkconfigmanager.cpp | 14 +- src/network/bearer/qnetworkconfigmanager.h | 14 +- .../bearer/qnetworkconfigmanager_p.cpp | 14 +- src/network/bearer/qnetworkconfigmanager_p.h | 14 +- src/network/bearer/qnetworkconfiguration.cpp | 14 +- src/network/bearer/qnetworkconfiguration.h | 14 +- src/network/bearer/qnetworkconfiguration_p.h | 14 +- src/network/bearer/qnetworksession.cpp | 14 +- src/network/bearer/qnetworksession.h | 14 +- src/network/bearer/qnetworksession_p.h | 14 +- src/network/bearer/qsharednetworksession.cpp | 14 +- src/network/bearer/qsharednetworksession_p.h | 14 +- .../doc/snippets/code/doc_src_qtnetwork.cpp | 10 +- .../snippets/code/src_network_access_qftp.cpp | 10 +- .../src_network_access_qhttpmultipart.cpp | 14 +- .../code/src_network_access_qhttppart.cpp | 14 +- ...c_network_access_qnetworkaccessmanager.cpp | 10 +- .../src_network_access_qnetworkdiskcache.cpp | 10 +- .../code/src_network_access_qnetworkreply.cpp | 10 +- .../src_network_access_qnetworkrequest.cpp | 10 +- ...c_network_bearer_qnetworkconfigmanager.cpp | 10 +- .../code/src_network_kernel_qdnslookup.cpp | 8 +- .../code/src_network_kernel_qhostaddress.cpp | 10 +- .../code/src_network_kernel_qhostinfo.cpp | 10 +- .../code/src_network_kernel_qnetworkproxy.cpp | 10 +- .../src_network_socket_qabstractsocket.cpp | 10 +- .../src_network_socket_qlocalsocket_unix.cpp | 10 +- ...src_network_socket_qnativesocketengine.cpp | 10 +- .../code/src_network_socket_qtcpserver.cpp | 10 +- .../code/src_network_socket_qudpsocket.cpp | 10 +- .../code/src_network_ssl_qsslcertificate.cpp | 10 +- .../src_network_ssl_qsslconfiguration.cpp | 10 +- .../code/src_network_ssl_qsslsocket.cpp | 10 +- src/network/doc/snippets/network/tcpwait.cpp | 10 +- src/network/doc/src/bearermanagement.qdoc | 12 +- src/network/doc/src/examples.qdoc | 12 +- src/network/doc/src/network-programming.qdoc | 12 +- src/network/doc/src/qtnetwork.qdoc | 12 +- src/network/doc/src/ssl.qdoc | 12 +- src/network/kernel/qauthenticator.cpp | 14 +- src/network/kernel/qauthenticator.h | 14 +- src/network/kernel/qauthenticator_p.h | 14 +- src/network/kernel/qdnslookup.cpp | 12 +- src/network/kernel/qdnslookup.h | 12 +- src/network/kernel/qdnslookup_android.cpp | 12 +- src/network/kernel/qdnslookup_p.h | 12 +- src/network/kernel/qdnslookup_unix.cpp | 12 +- src/network/kernel/qdnslookup_win.cpp | 12 +- src/network/kernel/qdnslookup_winrt.cpp | 14 +- src/network/kernel/qhostaddress.cpp | 14 +- src/network/kernel/qhostaddress.h | 14 +- src/network/kernel/qhostaddress_p.h | 14 +- src/network/kernel/qhostinfo.cpp | 14 +- src/network/kernel/qhostinfo.h | 14 +- src/network/kernel/qhostinfo_p.h | 14 +- src/network/kernel/qhostinfo_unix.cpp | 14 +- src/network/kernel/qhostinfo_win.cpp | 14 +- src/network/kernel/qhostinfo_winrt.cpp | 14 +- src/network/kernel/qnetworkfunctions_wince.h | 14 +- src/network/kernel/qnetworkinterface.cpp | 14 +- src/network/kernel/qnetworkinterface.h | 14 +- src/network/kernel/qnetworkinterface_p.h | 14 +- src/network/kernel/qnetworkinterface_unix.cpp | 14 +- src/network/kernel/qnetworkinterface_win.cpp | 14 +- src/network/kernel/qnetworkinterface_win_p.h | 14 +- .../kernel/qnetworkinterface_winrt.cpp | 14 +- src/network/kernel/qnetworkproxy.cpp | 14 +- src/network/kernel/qnetworkproxy.h | 14 +- .../kernel/qnetworkproxy_blackberry.cpp | 12 +- src/network/kernel/qnetworkproxy_generic.cpp | 14 +- src/network/kernel/qnetworkproxy_libproxy.cpp | 36 ++- src/network/kernel/qnetworkproxy_mac.cpp | 14 +- src/network/kernel/qnetworkproxy_p.h | 12 +- src/network/kernel/qnetworkproxy_win.cpp | 14 +- src/network/kernel/qurlinfo.cpp | 14 +- src/network/kernel/qurlinfo_p.h | 14 +- src/network/socket/qabstractsocket.cpp | 14 +- src/network/socket/qabstractsocket.h | 14 +- src/network/socket/qabstractsocket_p.h | 14 +- src/network/socket/qabstractsocketengine.cpp | 14 +- src/network/socket/qabstractsocketengine_p.h | 14 +- src/network/socket/qhttpsocketengine.cpp | 14 +- src/network/socket/qhttpsocketengine_p.h | 14 +- src/network/socket/qlocalserver.cpp | 14 +- src/network/socket/qlocalserver.h | 14 +- src/network/socket/qlocalserver_p.h | 14 +- src/network/socket/qlocalserver_tcp.cpp | 14 +- src/network/socket/qlocalserver_unix.cpp | 14 +- src/network/socket/qlocalserver_win.cpp | 14 +- src/network/socket/qlocalsocket.cpp | 14 +- src/network/socket/qlocalsocket.h | 14 +- src/network/socket/qlocalsocket_p.h | 14 +- src/network/socket/qlocalsocket_tcp.cpp | 14 +- src/network/socket/qlocalsocket_unix.cpp | 14 +- src/network/socket/qlocalsocket_win.cpp | 14 +- src/network/socket/qnativesocketengine.cpp | 14 +- src/network/socket/qnativesocketengine_p.h | 14 +- .../socket/qnativesocketengine_unix.cpp | 14 +- .../socket/qnativesocketengine_win.cpp | 14 +- .../socket/qnativesocketengine_winrt.cpp | 14 +- .../socket/qnativesocketengine_winrt_p.h | 14 +- src/network/socket/qnet_unix_p.h | 14 +- src/network/socket/qsocks5socketengine.cpp | 14 +- src/network/socket/qsocks5socketengine_p.h | 14 +- src/network/socket/qtcpserver.cpp | 14 +- src/network/socket/qtcpserver.h | 14 +- src/network/socket/qtcpserver_p.h | 36 ++- src/network/socket/qtcpsocket.cpp | 14 +- src/network/socket/qtcpsocket.h | 14 +- src/network/socket/qtcpsocket_p.h | 14 +- src/network/socket/qudpsocket.cpp | 14 +- src/network/socket/qudpsocket.h | 14 +- src/network/ssl/qasn1element.cpp | 34 ++- src/network/ssl/qasn1element_p.h | 34 ++- src/network/ssl/qssl.cpp | 14 +- src/network/ssl/qssl.h | 14 +- src/network/ssl/qssl_p.h | 14 +- src/network/ssl/qsslcertificate.cpp | 14 +- src/network/ssl/qsslcertificate.h | 14 +- src/network/ssl/qsslcertificate_openssl.cpp | 36 ++- src/network/ssl/qsslcertificate_p.h | 14 +- src/network/ssl/qsslcertificate_qt.cpp | 36 ++- src/network/ssl/qsslcertificate_winrt.cpp | 36 ++- src/network/ssl/qsslcertificateextension.cpp | 12 +- src/network/ssl/qsslcertificateextension.h | 12 +- src/network/ssl/qsslcertificateextension_p.h | 12 +- src/network/ssl/qsslcipher.cpp | 14 +- src/network/ssl/qsslcipher.h | 14 +- src/network/ssl/qsslcipher_p.h | 14 +- src/network/ssl/qsslconfiguration.cpp | 14 +- src/network/ssl/qsslconfiguration.h | 14 +- src/network/ssl/qsslconfiguration_p.h | 14 +- src/network/ssl/qsslcontext_openssl.cpp | 14 +- src/network/ssl/qsslcontext_openssl_p.h | 14 +- src/network/ssl/qsslellipticcurve.cpp | 34 ++- src/network/ssl/qsslellipticcurve.h | 34 ++- src/network/ssl/qsslellipticcurve_dummy.cpp | 34 ++- src/network/ssl/qsslellipticcurve_openssl.cpp | 34 ++- src/network/ssl/qsslerror.cpp | 14 +- src/network/ssl/qsslerror.h | 14 +- src/network/ssl/qsslkey.h | 14 +- src/network/ssl/qsslkey_mac.cpp | 34 ++- src/network/ssl/qsslkey_openssl.cpp | 36 ++- src/network/ssl/qsslkey_p.cpp | 14 +- src/network/ssl/qsslkey_p.h | 14 +- src/network/ssl/qsslkey_qt.cpp | 34 ++- src/network/ssl/qsslkey_winrt.cpp | 36 ++- .../ssl/qsslpresharedkeyauthenticator.cpp | 34 ++- .../ssl/qsslpresharedkeyauthenticator.h | 34 ++- .../ssl/qsslpresharedkeyauthenticator_p.h | 36 ++- src/network/ssl/qsslsocket.cpp | 14 +- src/network/ssl/qsslsocket.h | 14 +- src/network/ssl/qsslsocket_mac.cpp | 34 ++- src/network/ssl/qsslsocket_mac_p.h | 34 ++- src/network/ssl/qsslsocket_openssl.cpp | 14 +- .../ssl/qsslsocket_openssl_android.cpp | 14 +- src/network/ssl/qsslsocket_openssl_p.h | 14 +- .../ssl/qsslsocket_openssl_symbols.cpp | 14 +- .../ssl/qsslsocket_openssl_symbols_p.h | 14 +- src/network/ssl/qsslsocket_p.h | 14 +- src/network/ssl/qsslsocket_winrt.cpp | 36 ++- src/network/ssl/qsslsocket_winrt_p.h | 36 ++- .../doc/snippets/code/doc_src_qtopengl.cpp | 10 +- .../doc/snippets/code/src_opengl_qgl.cpp | 10 +- .../snippets/code/src_opengl_qglcolormap.cpp | 10 +- .../code/src_opengl_qglpixelbuffer.cpp | 10 +- .../code/src_opengl_qglshaderprogram.cpp | 10 +- src/opengl/doc/src/qtopengl-examples.qdoc | 12 +- src/opengl/doc/src/qtopengl-index.qdoc | 12 +- src/opengl/doc/src/qtopengl-module.qdoc | 12 +- .../gl2paintengineex/qgl2pexvertexarray.cpp | 14 +- .../gl2paintengineex/qgl2pexvertexarray_p.h | 14 +- .../gl2paintengineex/qglcustomshaderstage.cpp | 14 +- .../gl2paintengineex/qglcustomshaderstage_p.h | 14 +- .../qglengineshadermanager.cpp | 14 +- .../qglengineshadermanager_p.h | 14 +- .../qglengineshadersource_p.h | 14 +- .../gl2paintengineex/qglgradientcache.cpp | 14 +- .../gl2paintengineex/qglgradientcache_p.h | 14 +- .../gl2paintengineex/qglshadercache_meego_p.h | 14 +- .../gl2paintengineex/qglshadercache_p.h | 14 +- .../qpaintengineex_opengl2.cpp | 14 +- .../qpaintengineex_opengl2_p.h | 14 +- .../qtextureglyphcache_gl.cpp | 14 +- .../qtextureglyphcache_gl_p.h | 14 +- src/opengl/qgl.cpp | 14 +- src/opengl/qgl.h | 14 +- src/opengl/qgl_p.h | 14 +- src/opengl/qglbuffer.cpp | 14 +- src/opengl/qglbuffer.h | 14 +- src/opengl/qglcolormap.cpp | 14 +- src/opengl/qglcolormap.h | 14 +- src/opengl/qglframebufferobject.cpp | 14 +- src/opengl/qglframebufferobject.h | 14 +- src/opengl/qglframebufferobject_p.h | 14 +- src/opengl/qglfunctions.cpp | 14 +- src/opengl/qglfunctions.h | 14 +- src/opengl/qglpaintdevice.cpp | 14 +- src/opengl/qglpaintdevice_p.h | 14 +- src/opengl/qglpixelbuffer.cpp | 14 +- src/opengl/qglpixelbuffer.h | 14 +- src/opengl/qglpixelbuffer_p.h | 14 +- src/opengl/qglshaderprogram.cpp | 14 +- src/opengl/qglshaderprogram.h | 14 +- src/opengl/qgraphicsshadereffect.cpp | 14 +- src/opengl/qgraphicsshadereffect_p.h | 14 +- src/opengl/qtopenglglobal.h | 12 +- src/openglextensions/qopenglextensions.cpp | 8 +- src/openglextensions/qopenglextensions.h | 8 +- .../snippets/qwindowswindowfunctions/main.cpp | 10 +- .../doc/snippets/qxcbwindowfunctions/main.cpp | 10 +- .../doc/src/qtplatformheaders.qdoc | 12 +- .../eglfsfunctions/qeglfsfunctions.h | 14 +- .../eglfsfunctions/qeglfsfunctions.qdoc | 12 +- .../nativecontexts/qcocoanativecontext.h | 14 +- .../nativecontexts/qcocoanativecontext.qdoc | 12 +- .../nativecontexts/qeglnativecontext.h | 14 +- .../nativecontexts/qeglnativecontext.qdoc | 12 +- .../nativecontexts/qglxnativecontext.h | 14 +- .../nativecontexts/qglxnativecontext.qdoc | 12 +- .../nativecontexts/qwglnativecontext.h | 14 +- .../nativecontexts/qwglnativecontext.qdoc | 12 +- .../qwindowswindowfunctions.h | 14 +- .../qwindowswindowfunctions.qdoc | 12 +- .../xcbfunctions/qxcbwindowfunctions.h | 14 +- .../xcbfunctions/qxcbwindowfunctions.qdoc | 12 +- .../accessibility/qaccessiblebridgeutils.cpp | 14 +- .../accessibility/qaccessiblebridgeutils_p.h | 14 +- .../cfsocketnotifier/qcfsocketnotifier.cpp | 14 +- .../cfsocketnotifier/qcfsocketnotifier_p.h | 14 +- .../cglconvenience/cglconvenience.mm | 36 ++- .../cglconvenience/cglconvenience_p.h | 14 +- src/platformsupport/clipboard/qmacmime.mm | 36 ++- src/platformsupport/clipboard/qmacmime_p.h | 14 +- .../dbusmenu/qdbusmenuadaptor.cpp | 14 +- .../dbusmenu/qdbusmenuadaptor_p.h | 14 +- .../dbusmenu/qdbusmenuconnection.cpp | 14 +- .../dbusmenu/qdbusmenuconnection_p.h | 14 +- .../dbusmenu/qdbusmenutypes.cpp | 14 +- .../dbusmenu/qdbusmenutypes_p.h | 14 +- .../dbusmenu/qdbusplatformmenu.cpp | 14 +- .../dbusmenu/qdbusplatformmenu_p.h | 14 +- .../dbustray/qdbustrayicon.cpp | 14 +- .../dbustray/qdbustrayicon_p.h | 14 +- .../dbustray/qdbustraytypes.cpp | 14 +- .../dbustray/qdbustraytypes_p.h | 14 +- .../dbustray/qstatusnotifieritemadaptor.cpp | 14 +- .../dbustray/qstatusnotifieritemadaptor_p.h | 14 +- .../dbustray/qxdgnotificationproxy.cpp | 14 +- .../dbustray/qxdgnotificationproxy_p.h | 14 +- .../qdevicediscovery_dummy.cpp | 14 +- .../qdevicediscovery_dummy_p.h | 14 +- .../devicediscovery/qdevicediscovery_p.h | 14 +- .../qdevicediscovery_static.cpp | 14 +- .../qdevicediscovery_static_p.h | 14 +- .../devicediscovery/qdevicediscovery_udev.cpp | 14 +- .../devicediscovery/qdevicediscovery_udev_p.h | 14 +- .../eglconvenience/qeglconvenience.cpp | 14 +- .../eglconvenience/qeglconvenience_p.h | 14 +- .../eglconvenience/qeglpbuffer.cpp | 14 +- .../eglconvenience/qeglpbuffer_p.h | 14 +- .../eglconvenience/qeglplatformcontext.cpp | 14 +- .../eglconvenience/qeglplatformcontext_p.h | 14 +- .../eglconvenience/qeglplatformcursor.cpp | 14 +- .../eglconvenience/qeglplatformcursor_p.h | 14 +- .../qeglplatformintegration.cpp | 14 +- .../qeglplatformintegration_p.h | 14 +- .../eglconvenience/qeglplatformscreen.cpp | 14 +- .../eglconvenience/qeglplatformscreen_p.h | 14 +- .../eglconvenience/qeglplatformwindow.cpp | 14 +- .../eglconvenience/qeglplatformwindow_p.h | 14 +- .../eglconvenience/qxlibeglintegration.cpp | 14 +- .../eglconvenience/qxlibeglintegration_p.h | 14 +- .../eventdispatchers/qeventdispatcher_cf.mm | 36 ++- .../eventdispatchers/qeventdispatcher_cf_p.h | 14 +- .../qeventdispatcher_glib.cpp | 14 +- .../qeventdispatcher_glib_p.h | 14 +- .../qgenericunixeventdispatcher.cpp | 14 +- .../qgenericunixeventdispatcher_p.h | 14 +- .../eventdispatchers/qunixeventdispatcher.cpp | 14 +- .../qunixeventdispatcher_qpa_p.h | 14 +- .../fbconvenience/qfbbackingstore.cpp | 14 +- .../fbconvenience/qfbbackingstore_p.h | 14 +- .../fbconvenience/qfbcursor.cpp | 14 +- .../fbconvenience/qfbcursor_p.h | 14 +- .../fbconvenience/qfbscreen.cpp | 14 +- .../fbconvenience/qfbscreen_p.h | 14 +- .../fbconvenience/qfbvthandler.cpp | 14 +- .../fbconvenience/qfbvthandler_p.h | 14 +- .../fbconvenience/qfbwindow.cpp | 14 +- .../fbconvenience/qfbwindow_p.h | 14 +- .../basic/qbasicfontdatabase.cpp | 14 +- .../basic/qbasicfontdatabase_p.h | 14 +- .../fontconfig/qfontconfigdatabase.cpp | 14 +- .../fontconfig/qfontconfigdatabase_p.h | 14 +- .../fontconfig/qfontenginemultifontconfig.cpp | 14 +- .../fontconfig/qfontenginemultifontconfig_p.h | 14 +- .../genericunix/qgenericunixfontdatabase_p.h | 14 +- .../mac/qcoretextfontdatabase.mm | 36 ++- .../mac/qcoretextfontdatabase_p.h | 14 +- .../fontdatabases/mac/qfontengine_coretext.mm | 36 ++- .../mac/qfontengine_coretext_p.h | 14 +- .../glxconvenience/qglxconvenience.cpp | 14 +- .../glxconvenience/qglxconvenience_p.h | 14 +- .../qevdevkeyboard_defaultmap_p.h | 14 +- .../evdevkeyboard/qevdevkeyboardhandler.cpp | 14 +- .../evdevkeyboard/qevdevkeyboardhandler_p.h | 14 +- .../evdevkeyboard/qevdevkeyboardmanager.cpp | 14 +- .../evdevkeyboard/qevdevkeyboardmanager_p.h | 14 +- .../input/evdevmouse/qevdevmousehandler.cpp | 14 +- .../input/evdevmouse/qevdevmousehandler_p.h | 14 +- .../input/evdevmouse/qevdevmousemanager.cpp | 14 +- .../input/evdevmouse/qevdevmousemanager_p.h | 14 +- .../input/evdevtablet/qevdevtablet.cpp | 14 +- .../input/evdevtablet/qevdevtablet_p.h | 14 +- .../input/evdevtouch/qevdevtouch.cpp | 14 +- .../input/evdevtouch/qevdevtouch_p.h | 14 +- .../input/libinput/qlibinputhandler.cpp | 14 +- .../input/libinput/qlibinputhandler_p.h | 14 +- .../input/libinput/qlibinputkeyboard.cpp | 14 +- .../input/libinput/qlibinputkeyboard_p.h | 14 +- .../input/libinput/qlibinputpointer.cpp | 14 +- .../input/libinput/qlibinputpointer_p.h | 14 +- .../input/libinput/qlibinputtouch.cpp | 14 +- .../input/libinput/qlibinputtouch_p.h | 14 +- src/platformsupport/input/tslib/qtslib.cpp | 14 +- src/platformsupport/input/tslib/qtslib_p.h | 14 +- .../linuxaccessibility/application.cpp | 14 +- .../linuxaccessibility/application_p.h | 14 +- .../linuxaccessibility/atspiadaptor.cpp | 14 +- .../linuxaccessibility/atspiadaptor_p.h | 14 +- .../linuxaccessibility/bridge.cpp | 14 +- .../linuxaccessibility/bridge_p.h | 14 +- .../linuxaccessibility/cache.cpp | 14 +- .../linuxaccessibility/cache_p.h | 14 +- .../linuxaccessibility/constant_mappings.cpp | 14 +- .../linuxaccessibility/constant_mappings_p.h | 14 +- .../linuxaccessibility/dbusconnection.cpp | 14 +- .../linuxaccessibility/dbusconnection_p.h | 14 +- .../linuxaccessibility/struct_marshallers.cpp | 14 +- .../linuxaccessibility/struct_marshallers_p.h | 14 +- .../platformcompositor/qopenglcompositor.cpp | 14 +- .../platformcompositor/qopenglcompositor_p.h | 14 +- .../qopenglcompositorbackingstore.cpp | 14 +- .../qopenglcompositorbackingstore_p.h | 14 +- .../genericunix/qgenericunixservices.cpp | 14 +- .../genericunix/qgenericunixservices_p.h | 14 +- .../themes/genericunix/qgenericunixthemes.cpp | 14 +- .../themes/genericunix/qgenericunixthemes_p.h | 14 +- .../qt5/android/bearer/QtNetworkReceiver.java | 36 ++- src/plugins/bearer/android/src/main.cpp | 14 +- .../android/src/qandroidbearerengine.cpp | 14 +- .../bearer/android/src/qandroidbearerengine.h | 14 +- .../wrappers/androidconnectivitymanager.cpp | 14 +- .../src/wrappers/androidconnectivitymanager.h | 14 +- src/plugins/bearer/blackberry/main.cpp | 12 +- src/plugins/bearer/blackberry/qbbengine.cpp | 12 +- src/plugins/bearer/blackberry/qbbengine.h | 12 +- src/plugins/bearer/connman/main.cpp | 14 +- src/plugins/bearer/connman/qconnmanengine.cpp | 14 +- src/plugins/bearer/connman/qconnmanengine.h | 14 +- .../bearer/connman/qconnmanservice_linux.cpp | 14 +- .../bearer/connman/qconnmanservice_linux_p.h | 14 +- src/plugins/bearer/corewlan/main.cpp | 14 +- src/plugins/bearer/corewlan/qcorewlanengine.h | 14 +- .../bearer/corewlan/qcorewlanengine.mm | 36 ++- src/plugins/bearer/generic/main.cpp | 14 +- src/plugins/bearer/generic/qgenericengine.cpp | 14 +- src/plugins/bearer/generic/qgenericengine.h | 14 +- .../linux_common/qofonoservice_linux.cpp | 14 +- .../linux_common/qofonoservice_linux_p.h | 14 +- src/plugins/bearer/nativewifi/main.cpp | 14 +- src/plugins/bearer/nativewifi/platformdefs.h | 14 +- .../bearer/nativewifi/qnativewifiengine.cpp | 14 +- .../bearer/nativewifi/qnativewifiengine.h | 14 +- src/plugins/bearer/networkmanager/main.cpp | 14 +- .../networkmanager/qnetworkmanagerengine.cpp | 14 +- .../networkmanager/qnetworkmanagerengine.h | 14 +- .../networkmanager/qnetworkmanagerservice.cpp | 14 +- .../networkmanager/qnetworkmanagerservice.h | 14 +- src/plugins/bearer/nla/main.cpp | 14 +- src/plugins/bearer/nla/qnlaengine.cpp | 14 +- src/plugins/bearer/nla/qnlaengine.h | 14 +- src/plugins/bearer/platformdefs_win.h | 14 +- src/plugins/bearer/qbearerengine_impl.h | 14 +- src/plugins/bearer/qnetworksession_impl.cpp | 14 +- src/plugins/bearer/qnetworksession_impl.h | 14 +- src/plugins/generic/evdevkeyboard/main.cpp | 14 +- src/plugins/generic/evdevmouse/main.cpp | 14 +- src/plugins/generic/evdevtablet/main.cpp | 14 +- src/plugins/generic/evdevtouch/main.cpp | 14 +- src/plugins/generic/libinput/main.cpp | 14 +- src/plugins/generic/tslib/main.cpp | 14 +- src/plugins/generic/tuiotouch/main.cpp | 14 +- src/plugins/generic/tuiotouch/qoscbundle.cpp | 14 +- src/plugins/generic/tuiotouch/qoscbundle_p.h | 14 +- src/plugins/generic/tuiotouch/qoscmessage.cpp | 14 +- src/plugins/generic/tuiotouch/qoscmessage_p.h | 14 +- src/plugins/generic/tuiotouch/qtuio_p.h | 14 +- src/plugins/generic/tuiotouch/qtuiocursor_p.h | 14 +- .../generic/tuiotouch/qtuiohandler.cpp | 14 +- .../generic/tuiotouch/qtuiohandler_p.h | 14 +- src/plugins/imageformats/gif/main.cpp | 14 +- src/plugins/imageformats/gif/main.h | 14 +- src/plugins/imageformats/ico/main.cpp | 14 +- src/plugins/imageformats/ico/main.h | 14 +- src/plugins/imageformats/ico/qicohandler.cpp | 14 +- src/plugins/imageformats/ico/qicohandler.h | 14 +- src/plugins/imageformats/jpeg/main.cpp | 14 +- src/plugins/imageformats/jpeg/main.h | 14 +- .../compose/generator/qtablegenerator.cpp | 14 +- .../compose/generator/qtablegenerator.h | 14 +- .../platforminputcontexts/compose/main.cpp | 14 +- .../compose/qcomposeplatforminputcontext.cpp | 14 +- .../compose/qcomposeplatforminputcontext.h | 14 +- .../platforminputcontexts/ibus/main.cpp | 14 +- .../ibus/qibusinputcontextproxy.cpp | 2 +- .../ibus/qibusinputcontextproxy.h | 2 +- .../ibus/qibusplatforminputcontext.cpp | 14 +- .../ibus/qibusplatforminputcontext.h | 14 +- .../platforminputcontexts/ibus/qibusproxy.cpp | 2 +- .../platforminputcontexts/ibus/qibusproxy.h | 2 +- .../platforminputcontexts/ibus/qibustypes.cpp | 14 +- .../platforminputcontexts/ibus/qibustypes.h | 14 +- .../android/androiddeadlockprotector.cpp | 14 +- .../android/androiddeadlockprotector.h | 14 +- .../android/androidjniaccessibility.cpp | 14 +- .../android/androidjniaccessibility.h | 14 +- .../platforms/android/androidjniclipboard.cpp | 12 +- .../platforms/android/androidjniclipboard.h | 12 +- .../platforms/android/androidjniinput.cpp | 12 +- .../platforms/android/androidjniinput.h | 12 +- .../platforms/android/androidjnimain.cpp | 14 +- .../platforms/android/androidjnimain.h | 14 +- .../platforms/android/androidjnimenu.cpp | 12 +- .../platforms/android/androidjnimenu.h | 12 +- .../android/androidplatformplugin.cpp | 12 +- .../platforms/android/androidsurfaceclient.h | 12 +- .../platforms/android/extract-dummy.cpp | 14 +- src/plugins/platforms/android/extract.cpp | 12 +- .../qandroidassetsfileenginehandler.cpp | 12 +- .../android/qandroidassetsfileenginehandler.h | 12 +- .../android/qandroideventdispatcher.cpp | 12 +- .../android/qandroideventdispatcher.h | 12 +- .../android/qandroidinputcontext.cpp | 14 +- .../platforms/android/qandroidinputcontext.h | 12 +- .../android/qandroidplatformaccessibility.cpp | 14 +- .../android/qandroidplatformaccessibility.h | 14 +- .../android/qandroidplatformbackingstore.cpp | 14 +- .../android/qandroidplatformbackingstore.h | 14 +- .../android/qandroidplatformclipboard.cpp | 12 +- .../android/qandroidplatformclipboard.h | 12 +- .../android/qandroidplatformdialoghelpers.cpp | 12 +- .../android/qandroidplatformdialoghelpers.h | 12 +- .../android/qandroidplatformfontdatabase.cpp | 12 +- .../android/qandroidplatformfontdatabase.h | 12 +- .../android/qandroidplatformforeignwindow.cpp | 14 +- .../android/qandroidplatformforeignwindow.h | 14 +- .../android/qandroidplatformintegration.cpp | 12 +- .../android/qandroidplatformintegration.h | 12 +- .../android/qandroidplatformmenu.cpp | 12 +- .../platforms/android/qandroidplatformmenu.h | 12 +- .../android/qandroidplatformmenubar.cpp | 12 +- .../android/qandroidplatformmenubar.h | 12 +- .../android/qandroidplatformmenuitem.cpp | 12 +- .../android/qandroidplatformmenuitem.h | 12 +- .../android/qandroidplatformopenglcontext.cpp | 14 +- .../android/qandroidplatformopenglcontext.h | 14 +- .../android/qandroidplatformopenglwindow.cpp | 14 +- .../android/qandroidplatformopenglwindow.h | 14 +- .../android/qandroidplatformscreen.cpp | 14 +- .../android/qandroidplatformscreen.h | 14 +- .../android/qandroidplatformservices.cpp | 12 +- .../android/qandroidplatformservices.h | 12 +- .../android/qandroidplatformtheme.cpp | 12 +- .../platforms/android/qandroidplatformtheme.h | 12 +- .../android/qandroidplatformwindow.cpp | 14 +- .../android/qandroidplatformwindow.h | 14 +- .../android/qandroidsystemlocale.cpp | 14 +- .../platforms/android/qandroidsystemlocale.h | 14 +- src/plugins/platforms/cocoa/main.mm | 36 ++- src/plugins/platforms/cocoa/messages.cpp | 14 +- src/plugins/platforms/cocoa/messages.h | 14 +- .../platforms/cocoa/qcocoaaccessibility.h | 14 +- .../platforms/cocoa/qcocoaaccessibility.mm | 36 ++- .../cocoa/qcocoaaccessibilityelement.h | 14 +- .../cocoa/qcocoaaccessibilityelement.mm | 36 ++- .../platforms/cocoa/qcocoaapplication.h | 14 +- .../platforms/cocoa/qcocoaapplication.mm | 38 ++- .../cocoa/qcocoaapplicationdelegate.h | 14 +- .../cocoa/qcocoaapplicationdelegate.mm | 36 ++- .../platforms/cocoa/qcocoaautoreleasepool.h | 14 +- .../platforms/cocoa/qcocoaautoreleasepool.mm | 38 ++- .../platforms/cocoa/qcocoabackingstore.h | 14 +- .../platforms/cocoa/qcocoabackingstore.mm | 36 ++- src/plugins/platforms/cocoa/qcocoaclipboard.h | 14 +- .../platforms/cocoa/qcocoaclipboard.mm | 36 ++- .../platforms/cocoa/qcocoacolordialoghelper.h | 14 +- .../cocoa/qcocoacolordialoghelper.mm | 36 ++- src/plugins/platforms/cocoa/qcocoacursor.h | 14 +- src/plugins/platforms/cocoa/qcocoacursor.mm | 36 ++- src/plugins/platforms/cocoa/qcocoadrag.h | 14 +- src/plugins/platforms/cocoa/qcocoadrag.mm | 36 ++- .../platforms/cocoa/qcocoaeventdispatcher.h | 14 +- .../platforms/cocoa/qcocoaeventdispatcher.mm | 36 ++- .../platforms/cocoa/qcocoafiledialoghelper.h | 14 +- .../platforms/cocoa/qcocoafiledialoghelper.mm | 36 ++- .../platforms/cocoa/qcocoafontdialoghelper.h | 14 +- .../platforms/cocoa/qcocoafontdialoghelper.mm | 36 ++- src/plugins/platforms/cocoa/qcocoaglcontext.h | 14 +- .../platforms/cocoa/qcocoaglcontext.mm | 36 ++- src/plugins/platforms/cocoa/qcocoahelpers.h | 14 +- src/plugins/platforms/cocoa/qcocoahelpers.mm | 36 ++- .../platforms/cocoa/qcocoainputcontext.h | 14 +- .../platforms/cocoa/qcocoainputcontext.mm | 36 ++- .../platforms/cocoa/qcocoaintegration.h | 14 +- .../platforms/cocoa/qcocoaintegration.mm | 36 ++- .../platforms/cocoa/qcocoaintrospection.h | 14 +- .../platforms/cocoa/qcocoaintrospection.mm | 38 ++- src/plugins/platforms/cocoa/qcocoakeymapper.h | 14 +- .../platforms/cocoa/qcocoakeymapper.mm | 36 ++- src/plugins/platforms/cocoa/qcocoamenu.h | 14 +- src/plugins/platforms/cocoa/qcocoamenu.mm | 34 ++- src/plugins/platforms/cocoa/qcocoamenubar.h | 14 +- src/plugins/platforms/cocoa/qcocoamenubar.mm | 34 ++- src/plugins/platforms/cocoa/qcocoamenuitem.h | 14 +- src/plugins/platforms/cocoa/qcocoamenuitem.mm | 34 ++- .../platforms/cocoa/qcocoamenuloader.h | 14 +- .../platforms/cocoa/qcocoamenuloader.mm | 36 ++- src/plugins/platforms/cocoa/qcocoamimetypes.h | 14 +- .../platforms/cocoa/qcocoamimetypes.mm | 36 ++- .../platforms/cocoa/qcocoanativeinterface.h | 14 +- .../platforms/cocoa/qcocoanativeinterface.mm | 36 ++- .../platforms/cocoa/qcocoaprintdevice.h | 12 +- .../platforms/cocoa/qcocoaprintdevice.mm | 34 ++- .../platforms/cocoa/qcocoaprintersupport.h | 14 +- .../platforms/cocoa/qcocoaprintersupport.mm | 36 ++- src/plugins/platforms/cocoa/qcocoaservices.h | 14 +- src/plugins/platforms/cocoa/qcocoaservices.mm | 38 ++- .../platforms/cocoa/qcocoasystemsettings.h | 14 +- .../platforms/cocoa/qcocoasystemsettings.mm | 36 ++- .../platforms/cocoa/qcocoasystemtrayicon.h | 14 +- .../platforms/cocoa/qcocoasystemtrayicon.mm | 36 ++- src/plugins/platforms/cocoa/qcocoatheme.h | 14 +- src/plugins/platforms/cocoa/qcocoatheme.mm | 36 ++- src/plugins/platforms/cocoa/qcocoawindow.h | 14 +- src/plugins/platforms/cocoa/qcocoawindow.mm | 36 ++- src/plugins/platforms/cocoa/qmacclipboard.h | 14 +- src/plugins/platforms/cocoa/qmacclipboard.mm | 36 ++- src/plugins/platforms/cocoa/qmacdefines_mac.h | 14 +- .../platforms/cocoa/qmultitouch_mac.mm | 36 ++- .../platforms/cocoa/qmultitouch_mac_p.h | 14 +- src/plugins/platforms/cocoa/qnsview.h | 14 +- src/plugins/platforms/cocoa/qnsview.mm | 36 ++- .../platforms/cocoa/qnsviewaccessibility.mm | 36 ++- .../platforms/cocoa/qnswindowdelegate.h | 14 +- .../platforms/cocoa/qnswindowdelegate.mm | 36 ++- .../platforms/cocoa/qpaintengine_mac.mm | 36 ++- .../platforms/cocoa/qpaintengine_mac_p.h | 14 +- .../platforms/cocoa/qprintengine_mac.mm | 36 ++- .../platforms/cocoa/qprintengine_mac_p.h | 14 +- src/plugins/platforms/cocoa/qt_mac_p.h | 14 +- .../direct2d/qwindowsdirect2dbackingstore.cpp | 14 +- .../direct2d/qwindowsdirect2dbackingstore.h | 14 +- .../direct2d/qwindowsdirect2dbitmap.cpp | 14 +- .../direct2d/qwindowsdirect2dbitmap.h | 14 +- .../direct2d/qwindowsdirect2dcontext.cpp | 14 +- .../direct2d/qwindowsdirect2dcontext.h | 14 +- .../qwindowsdirect2ddevicecontext.cpp | 14 +- .../direct2d/qwindowsdirect2ddevicecontext.h | 14 +- .../direct2d/qwindowsdirect2dhelpers.h | 14 +- .../direct2d/qwindowsdirect2dintegration.cpp | 14 +- .../direct2d/qwindowsdirect2dintegration.h | 14 +- .../qwindowsdirect2dnativeinterface.cpp | 14 +- .../qwindowsdirect2dnativeinterface.h | 14 +- .../direct2d/qwindowsdirect2dpaintdevice.cpp | 14 +- .../direct2d/qwindowsdirect2dpaintdevice.h | 14 +- .../direct2d/qwindowsdirect2dpaintengine.cpp | 14 +- .../direct2d/qwindowsdirect2dpaintengine.h | 14 +- .../qwindowsdirect2dplatformpixmap.cpp | 14 +- .../direct2d/qwindowsdirect2dplatformpixmap.h | 14 +- .../qwindowsdirect2dplatformplugin.cpp | 14 +- .../direct2d/qwindowsdirect2dwindow.cpp | 14 +- .../direct2d/qwindowsdirect2dwindow.h | 14 +- src/plugins/platforms/directfb/main.cpp | 14 +- .../platforms/directfb/qdirectfb_egl.cpp | 14 +- .../platforms/directfb/qdirectfb_egl.h | 14 +- .../directfb/qdirectfbbackingstore.cpp | 14 +- .../directfb/qdirectfbbackingstore.h | 14 +- .../platforms/directfb/qdirectfbblitter.cpp | 14 +- .../platforms/directfb/qdirectfbblitter.h | 14 +- .../directfb/qdirectfbconvenience.cpp | 14 +- .../platforms/directfb/qdirectfbconvenience.h | 14 +- .../platforms/directfb/qdirectfbcursor.cpp | 14 +- .../platforms/directfb/qdirectfbcursor.h | 14 +- .../platforms/directfb/qdirectfbeglhooks.h | 14 +- .../directfb/qdirectfbeglhooks_stub.cpp | 14 +- .../platforms/directfb/qdirectfbglcontext.cpp | 14 +- .../platforms/directfb/qdirectfbglcontext.h | 14 +- .../platforms/directfb/qdirectfbinput.cpp | 14 +- .../platforms/directfb/qdirectfbinput.h | 14 +- .../directfb/qdirectfbintegration.cpp | 14 +- .../platforms/directfb/qdirectfbintegration.h | 14 +- .../platforms/directfb/qdirectfbscreen.cpp | 14 +- .../platforms/directfb/qdirectfbscreen.h | 14 +- .../platforms/directfb/qdirectfbwindow.cpp | 14 +- .../platforms/directfb/qdirectfbwindow.h | 14 +- .../eglfs_kms/qeglfskmscursor.cpp | 36 ++- .../eglfs_kms/qeglfskmscursor.h | 36 ++- .../eglfs_kms/qeglfskmsdevice.cpp | 36 ++- .../eglfs_kms/qeglfskmsdevice.h | 36 ++- .../eglfs_kms/qeglfskmsintegration.cpp | 36 ++- .../eglfs_kms/qeglfskmsintegration.h | 36 ++- .../eglfs_kms/qeglfskmsmain.cpp | 38 ++- .../eglfs_kms/qeglfskmsscreen.cpp | 36 ++- .../eglfs_kms/qeglfskmsscreen.h | 36 ++- .../eglfs_x11/qeglfsx11integration.cpp | 14 +- .../eglfs_x11/qeglfsx11integration.h | 14 +- .../eglfs_x11/qeglfsx11main.cpp | 38 ++- src/plugins/platforms/eglfs/qeglfscontext.cpp | 14 +- src/plugins/platforms/eglfs/qeglfscontext.h | 14 +- .../eglfs/qeglfsdeviceintegration.cpp | 36 ++- .../platforms/eglfs/qeglfsdeviceintegration.h | 14 +- src/plugins/platforms/eglfs/qeglfsglobal.h | 14 +- src/plugins/platforms/eglfs/qeglfshooks.cpp | 14 +- src/plugins/platforms/eglfs/qeglfshooks.h | 14 +- .../platforms/eglfs/qeglfsintegration.cpp | 14 +- .../platforms/eglfs/qeglfsintegration.h | 14 +- src/plugins/platforms/eglfs/qeglfsmain.cpp | 14 +- .../platforms/eglfs/qeglfsoffscreenwindow.cpp | 36 ++- .../platforms/eglfs/qeglfsoffscreenwindow.h | 38 ++- src/plugins/platforms/eglfs/qeglfsscreen.cpp | 14 +- src/plugins/platforms/eglfs/qeglfsscreen.h | 14 +- src/plugins/platforms/eglfs/qeglfswindow.cpp | 14 +- src/plugins/platforms/eglfs/qeglfswindow.h | 14 +- src/plugins/platforms/ios/plugin.mm | 36 ++- .../platforms/ios/qiosapplicationdelegate.h | 14 +- .../platforms/ios/qiosapplicationdelegate.mm | 36 ++- .../platforms/ios/qiosapplicationstate.h | 14 +- .../platforms/ios/qiosapplicationstate.mm | 36 ++- src/plugins/platforms/ios/qiosbackingstore.h | 14 +- src/plugins/platforms/ios/qiosbackingstore.mm | 36 ++- src/plugins/platforms/ios/qiosclipboard.h | 14 +- src/plugins/platforms/ios/qiosclipboard.mm | 36 ++- src/plugins/platforms/ios/qioscontext.h | 14 +- src/plugins/platforms/ios/qioscontext.mm | 36 ++- .../platforms/ios/qioseventdispatcher.h | 14 +- .../platforms/ios/qioseventdispatcher.mm | 36 ++- src/plugins/platforms/ios/qiosglobal.h | 14 +- src/plugins/platforms/ios/qiosglobal.mm | 36 ++- src/plugins/platforms/ios/qiosinputcontext.h | 14 +- src/plugins/platforms/ios/qiosinputcontext.mm | 36 ++- src/plugins/platforms/ios/qiosintegration.h | 14 +- src/plugins/platforms/ios/qiosintegration.mm | 36 ++- src/plugins/platforms/ios/qiosmenu.h | 36 ++- src/plugins/platforms/ios/qiosmenu.mm | 36 ++- .../platforms/ios/qiosplatformaccessibility.h | 14 +- .../ios/qiosplatformaccessibility.mm | 36 ++- src/plugins/platforms/ios/qiosscreen.h | 14 +- src/plugins/platforms/ios/qiosscreen.mm | 36 ++- src/plugins/platforms/ios/qiosservices.h | 14 +- src/plugins/platforms/ios/qiosservices.mm | 36 ++- src/plugins/platforms/ios/qiostextresponder.h | 36 ++- .../platforms/ios/qiostextresponder.mm | 36 ++- src/plugins/platforms/ios/qiostheme.h | 14 +- src/plugins/platforms/ios/qiostheme.mm | 36 ++- .../platforms/ios/qiosviewcontroller.h | 14 +- .../platforms/ios/qiosviewcontroller.mm | 36 ++- src/plugins/platforms/ios/qioswindow.h | 14 +- src/plugins/platforms/ios/qioswindow.mm | 36 ++- .../platforms/ios/quiaccessibilityelement.h | 14 +- .../platforms/ios/quiaccessibilityelement.mm | 36 ++- src/plugins/platforms/ios/quiview.h | 14 +- src/plugins/platforms/ios/quiview.mm | 36 ++- .../platforms/ios/quiview_accessibility.mm | 36 ++- src/plugins/platforms/kms/main.cpp | 14 +- .../platforms/kms/qkmsbackingstore.cpp | 14 +- src/plugins/platforms/kms/qkmsbackingstore.h | 14 +- src/plugins/platforms/kms/qkmscontext.cpp | 14 +- src/plugins/platforms/kms/qkmscontext.h | 14 +- src/plugins/platforms/kms/qkmscursor.cpp | 14 +- src/plugins/platforms/kms/qkmscursor.h | 14 +- src/plugins/platforms/kms/qkmsdevice.cpp | 14 +- src/plugins/platforms/kms/qkmsdevice.h | 14 +- src/plugins/platforms/kms/qkmsintegration.cpp | 14 +- src/plugins/platforms/kms/qkmsintegration.h | 14 +- .../platforms/kms/qkmsnativeinterface.cpp | 14 +- .../platforms/kms/qkmsnativeinterface.h | 14 +- src/plugins/platforms/kms/qkmsscreen.cpp | 14 +- src/plugins/platforms/kms/qkmsscreen.h | 14 +- src/plugins/platforms/kms/qkmswindow.cpp | 14 +- src/plugins/platforms/kms/qkmswindow.h | 14 +- src/plugins/platforms/linuxfb/main.cpp | 14 +- .../platforms/linuxfb/qlinuxfbintegration.cpp | 14 +- .../platforms/linuxfb/qlinuxfbintegration.h | 14 +- .../platforms/linuxfb/qlinuxfbscreen.cpp | 14 +- .../platforms/linuxfb/qlinuxfbscreen.h | 14 +- src/plugins/platforms/minimal/main.cpp | 14 +- .../minimal/qminimalbackingstore.cpp | 14 +- .../platforms/minimal/qminimalbackingstore.h | 14 +- .../platforms/minimal/qminimalintegration.cpp | 14 +- .../platforms/minimal/qminimalintegration.h | 14 +- src/plugins/platforms/minimalegl/main.cpp | 14 +- .../minimalegl/qminimaleglbackingstore.cpp | 14 +- .../minimalegl/qminimaleglbackingstore.h | 14 +- .../minimalegl/qminimaleglintegration.cpp | 14 +- .../minimalegl/qminimaleglintegration.h | 14 +- .../minimalegl/qminimaleglscreen.cpp | 14 +- .../platforms/minimalegl/qminimaleglscreen.h | 14 +- .../minimalegl/qminimaleglwindow.cpp | 14 +- .../platforms/minimalegl/qminimaleglwindow.h | 14 +- src/plugins/platforms/offscreen/main.cpp | 14 +- .../platforms/offscreen/qoffscreencommon.cpp | 14 +- .../platforms/offscreen/qoffscreencommon.h | 14 +- .../offscreen/qoffscreenintegration.cpp | 14 +- .../offscreen/qoffscreenintegration.h | 14 +- .../offscreen/qoffscreenintegration_dummy.cpp | 14 +- .../offscreen/qoffscreenintegration_x11.cpp | 14 +- .../offscreen/qoffscreenintegration_x11.h | 14 +- .../platforms/offscreen/qoffscreenwindow.cpp | 14 +- .../platforms/offscreen/qoffscreenwindow.h | 14 +- src/plugins/platforms/openwfd/main.cpp | 14 +- .../openwfd/qopenwfdbackingstore.cpp | 14 +- .../platforms/openwfd/qopenwfdbackingstore.h | 14 +- .../platforms/openwfd/qopenwfddevice.cpp | 14 +- .../platforms/openwfd/qopenwfddevice.h | 14 +- .../platforms/openwfd/qopenwfdevent.cpp | 14 +- src/plugins/platforms/openwfd/qopenwfdevent.h | 14 +- .../platforms/openwfd/qopenwfdglcontext.cpp | 14 +- .../platforms/openwfd/qopenwfdglcontext.h | 14 +- .../platforms/openwfd/qopenwfdintegration.cpp | 14 +- .../platforms/openwfd/qopenwfdintegration.h | 14 +- .../openwfd/qopenwfdnativeinterface.cpp | 14 +- .../openwfd/qopenwfdnativeinterface.h | 14 +- .../openwfd/qopenwfdoutputbuffer.cpp | 14 +- .../platforms/openwfd/qopenwfdoutputbuffer.h | 14 +- .../platforms/openwfd/qopenwfdport.cpp | 14 +- src/plugins/platforms/openwfd/qopenwfdport.h | 14 +- .../platforms/openwfd/qopenwfdportmode.cpp | 14 +- .../platforms/openwfd/qopenwfdportmode.h | 14 +- .../platforms/openwfd/qopenwfdscreen.cpp | 14 +- .../platforms/openwfd/qopenwfdscreen.h | 14 +- .../platforms/openwfd/qopenwfdwindow.cpp | 14 +- .../platforms/openwfd/qopenwfdwindow.h | 14 +- src/plugins/platforms/qnx/main.cpp | 12 +- src/plugins/platforms/qnx/main.h | 12 +- .../platforms/qnx/qblackberrytheme.cpp | 12 +- src/plugins/platforms/qnx/qblackberrytheme.h | 12 +- src/plugins/platforms/qnx/qqnxabstractcover.h | 12 +- .../platforms/qnx/qqnxabstractnavigator.cpp | 12 +- .../platforms/qnx/qqnxabstractnavigator.h | 12 +- .../qnx/qqnxabstractvirtualkeyboard.cpp | 12 +- .../qnx/qqnxabstractvirtualkeyboard.h | 12 +- .../platforms/qnx/qqnxbpseventfilter.cpp | 12 +- .../platforms/qnx/qqnxbpseventfilter.h | 12 +- src/plugins/platforms/qnx/qqnxbuffer.cpp | 12 +- src/plugins/platforms/qnx/qqnxbuffer.h | 12 +- .../platforms/qnx/qqnxbuttoneventnotifier.cpp | 12 +- .../platforms/qnx/qqnxbuttoneventnotifier.h | 12 +- src/plugins/platforms/qnx/qqnxclipboard.cpp | 12 +- src/plugins/platforms/qnx/qqnxclipboard.h | 12 +- src/plugins/platforms/qnx/qqnxcursor.cpp | 12 +- src/plugins/platforms/qnx/qqnxcursor.h | 12 +- src/plugins/platforms/qnx/qqnxeglwindow.cpp | 12 +- src/plugins/platforms/qnx/qqnxeglwindow.h | 12 +- .../qnx/qqnxeventdispatcher_blackberry.cpp | 12 +- .../qnx/qqnxeventdispatcher_blackberry.h | 12 +- .../platforms/qnx/qqnxfiledialoghelper.h | 12 +- .../qnx/qqnxfiledialoghelper_bb10.cpp | 12 +- .../qnx/qqnxfiledialoghelper_playbook.cpp | 12 +- src/plugins/platforms/qnx/qqnxfilepicker.cpp | 12 +- src/plugins/platforms/qnx/qqnxfilepicker.h | 12 +- src/plugins/platforms/qnx/qqnxglcontext.cpp | 12 +- src/plugins/platforms/qnx/qqnxglcontext.h | 12 +- src/plugins/platforms/qnx/qqnxglobal.cpp | 12 +- src/plugins/platforms/qnx/qqnxglobal.h | 12 +- .../platforms/qnx/qqnxinputcontext_imf.cpp | 12 +- .../platforms/qnx/qqnxinputcontext_imf.h | 12 +- .../platforms/qnx/qqnxinputcontext_noimf.cpp | 12 +- .../platforms/qnx/qqnxinputcontext_noimf.h | 12 +- src/plugins/platforms/qnx/qqnxintegration.cpp | 12 +- src/plugins/platforms/qnx/qqnxintegration.h | 12 +- src/plugins/platforms/qnx/qqnxkeytranslator.h | 12 +- src/plugins/platforms/qnx/qqnxlgmon.cpp | 12 +- src/plugins/platforms/qnx/qqnxlgmon.h | 12 +- .../platforms/qnx/qqnxnativeinterface.cpp | 12 +- .../platforms/qnx/qqnxnativeinterface.h | 12 +- .../platforms/qnx/qqnxnavigatorbps.cpp | 12 +- src/plugins/platforms/qnx/qqnxnavigatorbps.h | 12 +- .../platforms/qnx/qqnxnavigatorcover.cpp | 12 +- .../platforms/qnx/qqnxnavigatorcover.h | 12 +- .../qnx/qqnxnavigatoreventhandler.cpp | 12 +- .../platforms/qnx/qqnxnavigatoreventhandler.h | 12 +- .../qnx/qqnxnavigatoreventnotifier.cpp | 12 +- .../qnx/qqnxnavigatoreventnotifier.h | 12 +- .../platforms/qnx/qqnxnavigatorpps.cpp | 12 +- src/plugins/platforms/qnx/qqnxnavigatorpps.h | 12 +- .../platforms/qnx/qqnxrasterbackingstore.cpp | 12 +- .../platforms/qnx/qqnxrasterbackingstore.h | 12 +- .../platforms/qnx/qqnxrasterwindow.cpp | 12 +- src/plugins/platforms/qnx/qqnxrasterwindow.h | 12 +- src/plugins/platforms/qnx/qqnxscreen.cpp | 12 +- src/plugins/platforms/qnx/qqnxscreen.h | 12 +- .../platforms/qnx/qqnxscreeneventfilter.h | 12 +- .../platforms/qnx/qqnxscreeneventhandler.cpp | 12 +- .../platforms/qnx/qqnxscreeneventhandler.h | 12 +- .../platforms/qnx/qqnxscreeneventthread.cpp | 12 +- .../platforms/qnx/qqnxscreeneventthread.h | 12 +- src/plugins/platforms/qnx/qqnxservices.cpp | 12 +- src/plugins/platforms/qnx/qqnxservices.h | 12 +- .../platforms/qnx/qqnxsystemsettings.cpp | 12 +- .../platforms/qnx/qqnxsystemsettings.h | 12 +- .../platforms/qnx/qqnxvirtualkeyboardbps.cpp | 12 +- .../platforms/qnx/qqnxvirtualkeyboardbps.h | 12 +- .../platforms/qnx/qqnxvirtualkeyboardpps.cpp | 12 +- .../platforms/qnx/qqnxvirtualkeyboardpps.h | 12 +- src/plugins/platforms/qnx/qqnxwindow.cpp | 12 +- src/plugins/platforms/qnx/qqnxwindow.h | 12 +- .../platforms/windows/accessible/comutils.cpp | 14 +- .../platforms/windows/accessible/comutils.h | 14 +- .../windows/accessible/iaccessible2.cpp | 14 +- .../windows/accessible/iaccessible2.h | 14 +- .../accessible/qwindowsaccessibility.cpp | 14 +- .../accessible/qwindowsaccessibility.h | 14 +- .../accessible/qwindowsmsaaaccessible.cpp | 14 +- .../accessible/qwindowsmsaaaccessible.h | 14 +- src/plugins/platforms/windows/array.h | 14 +- src/plugins/platforms/windows/main.cpp | 14 +- .../windows/qplatformfunctions_wince.h | 14 +- .../platforms/windows/qtwindows_additional.h | 14 +- .../platforms/windows/qtwindowsglobal.h | 14 +- .../windows/qwindowsbackingstore.cpp | 14 +- .../platforms/windows/qwindowsbackingstore.h | 14 +- .../platforms/windows/qwindowsclipboard.cpp | 14 +- .../platforms/windows/qwindowsclipboard.h | 14 +- .../platforms/windows/qwindowscontext.cpp | 14 +- .../platforms/windows/qwindowscontext.h | 14 +- .../platforms/windows/qwindowscursor.cpp | 14 +- .../platforms/windows/qwindowscursor.h | 14 +- .../windows/qwindowsdialoghelpers.cpp | 14 +- .../platforms/windows/qwindowsdialoghelpers.h | 14 +- .../platforms/windows/qwindowsdrag.cpp | 14 +- src/plugins/platforms/windows/qwindowsdrag.h | 14 +- .../platforms/windows/qwindowseglcontext.cpp | 14 +- .../platforms/windows/qwindowseglcontext.h | 14 +- .../windows/qwindowsfontdatabase.cpp | 14 +- .../platforms/windows/qwindowsfontdatabase.h | 14 +- .../windows/qwindowsfontdatabase_ft.cpp | 14 +- .../windows/qwindowsfontdatabase_ft.h | 14 +- .../platforms/windows/qwindowsfontengine.cpp | 14 +- .../platforms/windows/qwindowsfontengine.h | 14 +- .../windows/qwindowsfontenginedirectwrite.cpp | 14 +- .../windows/qwindowsfontenginedirectwrite.h | 14 +- .../windows/qwindowsgdiintegration.cpp | 14 +- .../windows/qwindowsgdiintegration.h | 14 +- .../windows/qwindowsgdinativeinterface.cpp | 14 +- .../windows/qwindowsgdinativeinterface.h | 14 +- .../platforms/windows/qwindowsglcontext.cpp | 14 +- .../platforms/windows/qwindowsglcontext.h | 14 +- .../windows/qwindowsguieventdispatcher.cpp | 14 +- .../windows/qwindowsguieventdispatcher.h | 14 +- .../windows/qwindowsinputcontext.cpp | 14 +- .../platforms/windows/qwindowsinputcontext.h | 14 +- .../platforms/windows/qwindowsintegration.cpp | 14 +- .../platforms/windows/qwindowsintegration.h | 14 +- .../windows/qwindowsinternalmimedata.cpp | 14 +- .../windows/qwindowsinternalmimedata.h | 14 +- .../platforms/windows/qwindowskeymapper.cpp | 14 +- .../platforms/windows/qwindowskeymapper.h | 14 +- .../platforms/windows/qwindowsmime.cpp | 14 +- src/plugins/platforms/windows/qwindowsmime.h | 14 +- .../windows/qwindowsmousehandler.cpp | 14 +- .../platforms/windows/qwindowsmousehandler.h | 14 +- .../platforms/windows/qwindowsnativeimage.cpp | 14 +- .../platforms/windows/qwindowsnativeimage.h | 14 +- .../windows/qwindowsnativeinterface.cpp | 14 +- .../windows/qwindowsnativeinterface.h | 14 +- src/plugins/platforms/windows/qwindowsole.cpp | 14 +- src/plugins/platforms/windows/qwindowsole.h | 14 +- .../platforms/windows/qwindowsopenglcontext.h | 14 +- .../windows/qwindowsopengltester.cpp | 14 +- .../platforms/windows/qwindowsopengltester.h | 14 +- .../platforms/windows/qwindowsscaling.cpp | 14 +- .../platforms/windows/qwindowsscaling.h | 36 ++- .../platforms/windows/qwindowsscreen.cpp | 14 +- .../platforms/windows/qwindowsscreen.h | 14 +- .../platforms/windows/qwindowsservices.cpp | 14 +- .../platforms/windows/qwindowsservices.h | 14 +- .../windows/qwindowssessionmanager.cpp | 14 +- .../windows/qwindowssessionmanager.h | 14 +- .../windows/qwindowstabletsupport.cpp | 14 +- .../platforms/windows/qwindowstabletsupport.h | 14 +- .../platforms/windows/qwindowstheme.cpp | 14 +- src/plugins/platforms/windows/qwindowstheme.h | 14 +- .../platforms/windows/qwindowswindow.cpp | 14 +- .../platforms/windows/qwindowswindow.h | 14 +- src/plugins/platforms/winrt/main.cpp | 14 +- .../platforms/winrt/qwinrtbackingstore.cpp | 14 +- .../platforms/winrt/qwinrtbackingstore.h | 14 +- src/plugins/platforms/winrt/qwinrtcursor.cpp | 14 +- src/plugins/platforms/winrt/qwinrtcursor.h | 14 +- .../platforms/winrt/qwinrteglcontext.cpp | 14 +- .../platforms/winrt/qwinrteglcontext.h | 14 +- .../platforms/winrt/qwinrteventdispatcher.cpp | 14 +- .../platforms/winrt/qwinrteventdispatcher.h | 14 +- .../winrt/qwinrtfiledialoghelper.cpp | 36 ++- .../platforms/winrt/qwinrtfiledialoghelper.h | 36 ++- .../platforms/winrt/qwinrtfileengine.cpp | 36 ++- .../platforms/winrt/qwinrtfileengine.h | 36 ++- .../platforms/winrt/qwinrtfontdatabase.cpp | 14 +- .../platforms/winrt/qwinrtfontdatabase.h | 14 +- .../platforms/winrt/qwinrtinputcontext.cpp | 14 +- .../platforms/winrt/qwinrtinputcontext.h | 14 +- .../platforms/winrt/qwinrtintegration.cpp | 14 +- .../platforms/winrt/qwinrtintegration.h | 14 +- .../winrt/qwinrtmessagedialoghelper.cpp | 14 +- .../winrt/qwinrtmessagedialoghelper.h | 14 +- src/plugins/platforms/winrt/qwinrtscreen.cpp | 14 +- src/plugins/platforms/winrt/qwinrtscreen.h | 14 +- .../platforms/winrt/qwinrtservices.cpp | 14 +- src/plugins/platforms/winrt/qwinrtservices.h | 14 +- src/plugins/platforms/winrt/qwinrttheme.cpp | 14 +- src/plugins/platforms/winrt/qwinrttheme.h | 14 +- src/plugins/platforms/winrt/qwinrtwindow.cpp | 14 +- src/plugins/platforms/winrt/qwinrtwindow.h | 14 +- .../xcb/gl_integrations/qxcbglintegration.cpp | 38 ++- .../xcb/gl_integrations/qxcbglintegration.h | 36 ++- .../qxcbglintegrationfactory.cpp | 36 ++- .../qxcbglintegrationfactory.h | 38 ++- .../gl_integrations/qxcbglintegrationplugin.h | 38 ++- .../qxcbnativeinterfacehandler.cpp | 36 ++- .../qxcbnativeinterfacehandler.h | 36 ++- .../gl_integrations/xcb_egl/qxcbeglcontext.h | 36 ++- .../gl_integrations/xcb_egl/qxcbeglinclude.h | 38 ++- .../xcb_egl/qxcbeglintegration.cpp | 36 ++- .../xcb_egl/qxcbeglintegration.h | 36 ++- .../gl_integrations/xcb_egl/qxcbeglmain.cpp | 38 ++- .../xcb_egl/qxcbeglnativeinterfacehandler.cpp | 36 ++- .../xcb_egl/qxcbeglnativeinterfacehandler.h | 36 ++- .../gl_integrations/xcb_egl/qxcbeglwindow.cpp | 36 ++- .../gl_integrations/xcb_egl/qxcbeglwindow.h | 36 ++- .../xcb_glx/qglxintegration.cpp | 14 +- .../gl_integrations/xcb_glx/qglxintegration.h | 14 +- .../xcb_glx/qxcbglxintegration.cpp | 36 ++- .../xcb_glx/qxcbglxintegration.h | 36 ++- .../gl_integrations/xcb_glx/qxcbglxmain.cpp | 38 ++- .../xcb_glx/qxcbglxnativeinterfacehandler.cpp | 36 ++- .../xcb_glx/qxcbglxnativeinterfacehandler.h | 38 ++- .../gl_integrations/xcb_glx/qxcbglxwindow.cpp | 38 ++- .../gl_integrations/xcb_glx/qxcbglxwindow.h | 38 ++- .../platforms/xcb/qxcbbackingstore.cpp | 14 +- src/plugins/platforms/xcb/qxcbbackingstore.h | 14 +- src/plugins/platforms/xcb/qxcbclipboard.cpp | 14 +- src/plugins/platforms/xcb/qxcbclipboard.h | 14 +- src/plugins/platforms/xcb/qxcbconnection.cpp | 14 +- src/plugins/platforms/xcb/qxcbconnection.h | 14 +- .../platforms/xcb/qxcbconnection_xi2.cpp | 14 +- src/plugins/platforms/xcb/qxcbcursor.cpp | 14 +- src/plugins/platforms/xcb/qxcbcursor.h | 14 +- src/plugins/platforms/xcb/qxcbdrag.cpp | 14 +- src/plugins/platforms/xcb/qxcbdrag.h | 14 +- src/plugins/platforms/xcb/qxcbexport.h | 14 +- src/plugins/platforms/xcb/qxcbimage.cpp | 14 +- src/plugins/platforms/xcb/qxcbimage.h | 14 +- src/plugins/platforms/xcb/qxcbintegration.cpp | 14 +- src/plugins/platforms/xcb/qxcbintegration.h | 14 +- src/plugins/platforms/xcb/qxcbkeyboard.cpp | 14 +- src/plugins/platforms/xcb/qxcbkeyboard.h | 14 +- src/plugins/platforms/xcb/qxcbmain.cpp | 14 +- src/plugins/platforms/xcb/qxcbmime.cpp | 14 +- src/plugins/platforms/xcb/qxcbmime.h | 14 +- .../platforms/xcb/qxcbnativeinterface.cpp | 14 +- .../platforms/xcb/qxcbnativeinterface.h | 14 +- src/plugins/platforms/xcb/qxcbobject.h | 14 +- src/plugins/platforms/xcb/qxcbscreen.cpp | 14 +- src/plugins/platforms/xcb/qxcbscreen.h | 14 +- .../platforms/xcb/qxcbsessionmanager.cpp | 14 +- .../platforms/xcb/qxcbsessionmanager.h | 14 +- .../platforms/xcb/qxcbsystemtraytracker.cpp | 14 +- .../platforms/xcb/qxcbsystemtraytracker.h | 14 +- src/plugins/platforms/xcb/qxcbwindow.cpp | 14 +- src/plugins/platforms/xcb/qxcbwindow.h | 14 +- src/plugins/platforms/xcb/qxcbwmsupport.cpp | 14 +- src/plugins/platforms/xcb/qxcbwmsupport.h | 14 +- src/plugins/platforms/xcb/qxcbxsettings.cpp | 14 +- src/plugins/platforms/xcb/qxcbxsettings.h | 14 +- .../platforms/xcb/qxlibconvenience.cpp | 14 +- src/plugins/platforms/xcb/qxlibconvenience.h | 14 +- src/plugins/platformthemes/gtk2/main.cpp | 14 +- .../gtk2/qgtk2dialoghelpers.cpp | 14 +- .../platformthemes/gtk2/qgtk2dialoghelpers.h | 14 +- .../platformthemes/gtk2/qgtk2theme.cpp | 14 +- src/plugins/platformthemes/gtk2/qgtk2theme.h | 14 +- src/plugins/printsupport/cocoa/main.cpp | 14 +- src/plugins/printsupport/cups/main.cpp | 14 +- .../printsupport/cups/qcupsprintengine.cpp | 14 +- .../printsupport/cups/qcupsprintengine_p.h | 14 +- .../printsupport/cups/qcupsprintersupport.cpp | 14 +- .../printsupport/cups/qcupsprintersupport_p.h | 14 +- .../printsupport/cups/qppdprintdevice.cpp | 12 +- .../printsupport/cups/qppdprintdevice.h | 12 +- src/plugins/printsupport/windows/main.cpp | 14 +- .../windows/qwindowsprintdevice.cpp | 12 +- .../windows/qwindowsprintdevice.h | 12 +- .../windows/qwindowsprinterinfo.cpp | 14 +- .../windows/qwindowsprintersupport.cpp | 14 +- .../windows/qwindowsprintersupport.h | 14 +- src/plugins/sqldrivers/db2/main.cpp | 14 +- src/plugins/sqldrivers/ibase/main.cpp | 14 +- src/plugins/sqldrivers/mysql/main.cpp | 14 +- src/plugins/sqldrivers/oci/main.cpp | 14 +- src/plugins/sqldrivers/odbc/main.cpp | 14 +- src/plugins/sqldrivers/psql/main.cpp | 14 +- src/plugins/sqldrivers/sqlite/smain.cpp | 14 +- src/plugins/sqldrivers/sqlite2/smain.cpp | 14 +- src/plugins/sqldrivers/tds/main.cpp | 14 +- .../styles/bb10style/qbb10brightstyle.cpp | 34 ++- .../styles/bb10style/qbb10brightstyle.h | 36 ++- .../styles/bb10style/qbb10darkstyle.cpp | 34 ++- src/plugins/styles/bb10style/qbb10darkstyle.h | 36 ++- .../styles/bb10style/qbb10styleplugin.cpp | 34 ++- .../styles/bb10style/qbb10styleplugin.h | 36 ++- src/plugins/styles/bb10style/qpixmapstyle.cpp | 34 ++- src/plugins/styles/bb10style/qpixmapstyle.h | 34 ++- .../dialogs/qabstractprintdialog.cpp | 14 +- .../dialogs/qabstractprintdialog.h | 14 +- .../dialogs/qabstractprintdialog_p.h | 14 +- src/printsupport/dialogs/qpagesetupdialog.cpp | 14 +- src/printsupport/dialogs/qpagesetupdialog.h | 14 +- .../dialogs/qpagesetupdialog_mac.mm | 36 ++- src/printsupport/dialogs/qpagesetupdialog_p.h | 14 +- .../dialogs/qpagesetupdialog_unix.cpp | 14 +- .../dialogs/qpagesetupdialog_unix_p.h | 14 +- .../dialogs/qpagesetupdialog_win.cpp | 14 +- src/printsupport/dialogs/qprintdialog.h | 14 +- src/printsupport/dialogs/qprintdialog.qdoc | 12 +- src/printsupport/dialogs/qprintdialog_mac.mm | 36 ++- .../dialogs/qprintdialog_unix.cpp | 14 +- src/printsupport/dialogs/qprintdialog_win.cpp | 14 +- .../dialogs/qprintpreviewdialog.cpp | 14 +- .../dialogs/qprintpreviewdialog.h | 14 +- .../snippets/code/doc_src_qtprintsupport.cpp | 10 +- .../src_gui_dialogs_qabstractprintdialog.cpp | 10 +- .../doc/snippets/printing-qprinter/errors.cpp | 10 +- .../doc/snippets/printing-qprinter/object.cpp | 10 +- .../doc/snippets/widgetprinting.cpp | 10 +- .../doc/src/qtprintsupport-index.qdoc | 12 +- .../doc/src/qtprintsupport-module.qdoc | 12 +- src/printsupport/kernel/qcups.cpp | 14 +- src/printsupport/kernel/qcups_p.h | 14 +- .../kernel/qpaintengine_alpha.cpp | 14 +- .../kernel/qpaintengine_alpha_p.h | 14 +- .../kernel/qpaintengine_preview.cpp | 14 +- .../kernel/qpaintengine_preview_p.h | 14 +- .../kernel/qplatformprintdevice.cpp | 12 +- .../kernel/qplatformprintdevice.h | 12 +- .../kernel/qplatformprintersupport.cpp | 14 +- .../kernel/qplatformprintersupport.h | 14 +- .../kernel/qplatformprintplugin.cpp | 14 +- .../kernel/qplatformprintplugin.h | 14 +- src/printsupport/kernel/qprint_p.h | 12 +- src/printsupport/kernel/qprintdevice.cpp | 12 +- src/printsupport/kernel/qprintdevice_p.h | 12 +- src/printsupport/kernel/qprintengine.h | 14 +- src/printsupport/kernel/qprintengine_pdf.cpp | 14 +- src/printsupport/kernel/qprintengine_pdf_p.h | 14 +- src/printsupport/kernel/qprintengine_win.cpp | 14 +- src/printsupport/kernel/qprintengine_win_p.h | 14 +- src/printsupport/kernel/qprinter.cpp | 14 +- src/printsupport/kernel/qprinter.h | 14 +- src/printsupport/kernel/qprinter_p.h | 14 +- src/printsupport/kernel/qprinterinfo.cpp | 12 +- src/printsupport/kernel/qprinterinfo.h | 14 +- src/printsupport/kernel/qprinterinfo_p.h | 14 +- .../kernel/qtprintsupportglobal.h | 12 +- src/printsupport/widgets/qcupsjobwidget.cpp | 14 +- src/printsupport/widgets/qcupsjobwidget_p.h | 14 +- .../widgets/qprintpreviewwidget.cpp | 14 +- .../widgets/qprintpreviewwidget.h | 14 +- src/sql/doc/snippets/code/doc_src_qtsql.cpp | 10 +- .../doc/snippets/code/doc_src_sql-driver.cpp | 10 +- .../doc/snippets/code/doc_src_sql-driver.qdoc | 10 +- .../code/src_sql_kernel_qsqldatabase.cpp | 10 +- .../code/src_sql_kernel_qsqldriver.cpp | 10 +- .../code/src_sql_kernel_qsqlerror.cpp | 10 +- .../code/src_sql_kernel_qsqlquery.cpp | 10 +- .../code/src_sql_kernel_qsqlresult.cpp | 10 +- .../code/src_sql_models_qsqlquerymodel.cpp | 10 +- .../doc/snippets/sqldatabase/sqldatabase.cpp | 10 +- src/sql/doc/src/qsqldatatype-table.qdoc | 12 +- src/sql/doc/src/qtsql.qdoc | 12 +- src/sql/doc/src/sql-driver.qdoc | 12 +- src/sql/doc/src/sql-programming.qdoc | 12 +- src/sql/drivers/db2/qsql_db2.cpp | 14 +- src/sql/drivers/db2/qsql_db2_p.h | 14 +- src/sql/drivers/ibase/qsql_ibase.cpp | 14 +- src/sql/drivers/ibase/qsql_ibase_p.h | 14 +- src/sql/drivers/mysql/qsql_mysql.cpp | 14 +- src/sql/drivers/mysql/qsql_mysql_p.h | 14 +- src/sql/drivers/oci/qsql_oci.cpp | 14 +- src/sql/drivers/oci/qsql_oci_p.h | 14 +- src/sql/drivers/odbc/qsql_odbc.cpp | 14 +- src/sql/drivers/odbc/qsql_odbc_p.h | 14 +- src/sql/drivers/psql/qsql_psql.cpp | 14 +- src/sql/drivers/psql/qsql_psql_p.h | 14 +- src/sql/drivers/sqlite/qsql_sqlite.cpp | 14 +- src/sql/drivers/sqlite/qsql_sqlite_p.h | 14 +- src/sql/drivers/sqlite2/qsql_sqlite2.cpp | 14 +- src/sql/drivers/sqlite2/qsql_sqlite2_p.h | 14 +- src/sql/drivers/tds/qsql_tds.cpp | 14 +- src/sql/drivers/tds/qsql_tds_p.h | 14 +- src/sql/kernel/qsql.h | 14 +- src/sql/kernel/qsql.qdoc | 12 +- src/sql/kernel/qsqlcachedresult.cpp | 14 +- src/sql/kernel/qsqlcachedresult_p.h | 14 +- src/sql/kernel/qsqldatabase.cpp | 14 +- src/sql/kernel/qsqldatabase.h | 14 +- src/sql/kernel/qsqldriver.cpp | 14 +- src/sql/kernel/qsqldriver.h | 14 +- src/sql/kernel/qsqldriver_p.h | 14 +- src/sql/kernel/qsqldriverplugin.cpp | 14 +- src/sql/kernel/qsqldriverplugin.h | 14 +- src/sql/kernel/qsqlerror.cpp | 14 +- src/sql/kernel/qsqlerror.h | 14 +- src/sql/kernel/qsqlfield.cpp | 14 +- src/sql/kernel/qsqlfield.h | 14 +- src/sql/kernel/qsqlindex.cpp | 14 +- src/sql/kernel/qsqlindex.h | 14 +- src/sql/kernel/qsqlnulldriver_p.h | 14 +- src/sql/kernel/qsqlquery.cpp | 14 +- src/sql/kernel/qsqlquery.h | 14 +- src/sql/kernel/qsqlrecord.cpp | 14 +- src/sql/kernel/qsqlrecord.h | 14 +- src/sql/kernel/qsqlresult.cpp | 14 +- src/sql/kernel/qsqlresult.h | 14 +- src/sql/kernel/qsqlresult_p.h | 14 +- src/sql/models/qsqlquerymodel.cpp | 14 +- src/sql/models/qsqlquerymodel.h | 14 +- src/sql/models/qsqlquerymodel_p.h | 14 +- src/sql/models/qsqlrelationaldelegate.cpp | 14 +- src/sql/models/qsqlrelationaldelegate.h | 14 +- src/sql/models/qsqlrelationaltablemodel.cpp | 14 +- src/sql/models/qsqlrelationaltablemodel.h | 14 +- src/sql/models/qsqltablemodel.cpp | 14 +- src/sql/models/qsqltablemodel.h | 14 +- src/sql/models/qsqltablemodel_p.h | 14 +- .../doc/snippets/code/doc_src_qsignalspy.cpp | 10 +- .../doc/snippets/code/doc_src_qtestevent.cpp | 10 +- .../doc/snippets/code/doc_src_qtestlib.cpp | 10 +- .../doc/snippets/code/doc_src_qtestlib.qdoc | 10 +- .../doc/snippets/code/doc_src_qttest.cpp | 10 +- .../snippets/code/src_qtestlib_qtestcase.cpp | 10 +- src/testlib/doc/src/qt-webpages.qdoc | 16 +- src/testlib/doc/src/qttest-index.qdoc | 12 +- src/testlib/doc/src/qttest.qdoc | 12 +- src/testlib/doc/src/qttestlib-manual.qdoc | 12 +- src/testlib/qabstracttestlogger.cpp | 14 +- src/testlib/qabstracttestlogger_p.h | 14 +- src/testlib/qasciikey.cpp | 14 +- src/testlib/qbenchmark.cpp | 14 +- src/testlib/qbenchmark.h | 14 +- src/testlib/qbenchmark_p.h | 14 +- src/testlib/qbenchmarkevent.cpp | 14 +- src/testlib/qbenchmarkevent_p.h | 14 +- src/testlib/qbenchmarkmeasurement.cpp | 14 +- src/testlib/qbenchmarkmeasurement_p.h | 14 +- src/testlib/qbenchmarkmetric.cpp | 14 +- src/testlib/qbenchmarkmetric.h | 14 +- src/testlib/qbenchmarkmetric_p.h | 14 +- src/testlib/qbenchmarkperfevents.cpp | 12 +- src/testlib/qbenchmarkperfevents_p.h | 12 +- src/testlib/qbenchmarkvalgrind.cpp | 14 +- src/testlib/qbenchmarkvalgrind_p.h | 14 +- src/testlib/qcsvbenchmarklogger.cpp | 12 +- src/testlib/qcsvbenchmarklogger_p.h | 12 +- src/testlib/qplaintestlogger.cpp | 14 +- src/testlib/qplaintestlogger_p.h | 14 +- src/testlib/qsignaldumper.cpp | 14 +- src/testlib/qsignaldumper_p.h | 14 +- src/testlib/qsignalspy.h | 14 +- src/testlib/qsignalspy.qdoc | 12 +- src/testlib/qtest.h | 14 +- src/testlib/qtest_global.h | 14 +- src/testlib/qtest_gui.h | 14 +- src/testlib/qtest_widgets.h | 14 +- src/testlib/qtestaccessible.h | 14 +- src/testlib/qtestassert.h | 14 +- src/testlib/qtestblacklist.cpp | 36 ++- src/testlib/qtestblacklist_p.h | 14 +- src/testlib/qtestcase.cpp | 14 +- src/testlib/qtestcase.h | 14 +- src/testlib/qtestcoreelement_p.h | 14 +- src/testlib/qtestcorelist_p.h | 14 +- src/testlib/qtestdata.cpp | 14 +- src/testlib/qtestdata.h | 14 +- src/testlib/qtestelement.cpp | 14 +- src/testlib/qtestelement_p.h | 14 +- src/testlib/qtestelementattribute.cpp | 14 +- src/testlib/qtestelementattribute_p.h | 14 +- src/testlib/qtestevent.h | 14 +- src/testlib/qtestevent.qdoc | 12 +- src/testlib/qtesteventloop.h | 14 +- src/testlib/qtestkeyboard.h | 14 +- src/testlib/qtestlog.cpp | 14 +- src/testlib/qtestlog_p.h | 14 +- src/testlib/qtestmouse.h | 14 +- src/testlib/qtestresult.cpp | 14 +- src/testlib/qtestresult_p.h | 14 +- src/testlib/qtestspontaneevent.h | 14 +- src/testlib/qtestsystem.h | 14 +- src/testlib/qtesttable.cpp | 14 +- src/testlib/qtesttable_p.h | 14 +- src/testlib/qtesttouch.h | 14 +- src/testlib/qtestxunitstreamer.cpp | 14 +- src/testlib/qtestxunitstreamer_p.h | 14 +- src/testlib/qxmltestlogger.cpp | 14 +- src/testlib/qxmltestlogger_p.h | 14 +- src/testlib/qxunittestlogger.cpp | 14 +- src/testlib/qxunittestlogger_p.h | 14 +- src/tools/moc/generator.cpp | 14 +- src/tools/moc/generator.h | 14 +- src/tools/moc/keywords.cpp | 14 +- src/tools/moc/main.cpp | 14 +- src/tools/moc/moc.cpp | 14 +- src/tools/moc/moc.h | 14 +- src/tools/moc/mwerks_mac.cpp | 14 +- src/tools/moc/mwerks_mac.h | 14 +- src/tools/moc/outputrevision.h | 14 +- src/tools/moc/parser.cpp | 14 +- src/tools/moc/parser.h | 14 +- src/tools/moc/ppkeywords.cpp | 14 +- src/tools/moc/preprocessor.cpp | 14 +- src/tools/moc/preprocessor.h | 14 +- src/tools/moc/symbols.h | 14 +- src/tools/moc/token.cpp | 14 +- src/tools/moc/token.h | 14 +- src/tools/moc/util/generate.sh | 38 ++- src/tools/moc/util/generate_keywords.cpp | 14 +- src/tools/moc/util/licenseheader.txt | 38 ++- src/tools/moc/utils.h | 14 +- src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp | 16 +- src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp | 16 +- src/tools/qdoc/atom.cpp | 14 +- src/tools/qdoc/atom.h | 14 +- src/tools/qdoc/codechunk.cpp | 14 +- src/tools/qdoc/codechunk.h | 14 +- src/tools/qdoc/codemarker.cpp | 14 +- src/tools/qdoc/codemarker.h | 14 +- src/tools/qdoc/codeparser.cpp | 14 +- src/tools/qdoc/codeparser.h | 14 +- src/tools/qdoc/config.cpp | 14 +- src/tools/qdoc/config.h | 14 +- src/tools/qdoc/cppcodemarker.cpp | 14 +- src/tools/qdoc/cppcodemarker.h | 14 +- src/tools/qdoc/cppcodeparser.cpp | 14 +- src/tools/qdoc/cppcodeparser.h | 14 +- src/tools/qdoc/doc.cpp | 14 +- src/tools/qdoc/doc.h | 14 +- src/tools/qdoc/doc/corefeatures.qdoc | 12 +- .../doc/examples/componentset/ProgressBar.qml | 10 +- .../qdoc/doc/examples/componentset/Switch.qml | 10 +- .../doc/examples/componentset/TabWidget.qml | 10 +- .../componentset/uicomponents.qdoc.sample | 12 +- src/tools/qdoc/doc/examples/cpp.qdoc.sample | 12 +- src/tools/qdoc/doc/examples/examples.qdoc | 12 +- src/tools/qdoc/doc/examples/main.cpp | 14 +- src/tools/qdoc/doc/examples/mainwindow.cpp | 14 +- src/tools/qdoc/doc/examples/qml.qdoc.sample | 12 +- src/tools/qdoc/doc/examples/samples.qdocinc | 12 +- src/tools/qdoc/doc/qa-pages.qdoc | 12 +- src/tools/qdoc/doc/qdoc-guide/qdoc-guide.qdoc | 12 +- .../doc/qdoc-guide/qtwritingstyle-cpp.qdoc | 12 +- .../doc/qdoc-guide/qtwritingstyle-qml.qdoc | 12 +- src/tools/qdoc/doc/qdoc-manual-DITA.qdoc | 12 +- src/tools/qdoc/doc/qdoc-manual-cmdindex.qdoc | 12 +- .../qdoc/doc/qdoc-manual-contextcmds.qdoc | 12 +- src/tools/qdoc/doc/qdoc-manual-intro.qdoc | 12 +- .../qdoc/doc/qdoc-manual-markupcmds.qdoc | 16 +- src/tools/qdoc/doc/qdoc-manual-qdocconf.qdoc | 12 +- src/tools/qdoc/doc/qdoc-manual-topiccmds.qdoc | 12 +- src/tools/qdoc/doc/qdoc-manual.qdoc | 12 +- src/tools/qdoc/doc/qdoc-minimum-qdocconf.qdoc | 12 +- src/tools/qdoc/doc/qtgui-qdocconf.qdoc | 12 +- src/tools/qdoc/editdistance.cpp | 14 +- src/tools/qdoc/editdistance.h | 14 +- src/tools/qdoc/generator.cpp | 14 +- src/tools/qdoc/generator.h | 14 +- src/tools/qdoc/helpprojectwriter.cpp | 14 +- src/tools/qdoc/helpprojectwriter.h | 14 +- src/tools/qdoc/htmlgenerator.cpp | 14 +- src/tools/qdoc/htmlgenerator.h | 14 +- src/tools/qdoc/jscodemarker.cpp | 14 +- src/tools/qdoc/jscodemarker.h | 14 +- src/tools/qdoc/location.cpp | 14 +- src/tools/qdoc/location.h | 14 +- src/tools/qdoc/main.cpp | 14 +- src/tools/qdoc/node.cpp | 14 +- src/tools/qdoc/node.h | 14 +- src/tools/qdoc/openedlist.cpp | 14 +- src/tools/qdoc/openedlist.h | 14 +- src/tools/qdoc/plaincodemarker.cpp | 14 +- src/tools/qdoc/plaincodemarker.h | 14 +- src/tools/qdoc/puredocparser.cpp | 14 +- src/tools/qdoc/puredocparser.h | 14 +- src/tools/qdoc/qdocdatabase.cpp | 14 +- src/tools/qdoc/qdocdatabase.h | 14 +- src/tools/qdoc/qdocindexfiles.cpp | 14 +- src/tools/qdoc/qdocindexfiles.h | 14 +- src/tools/qdoc/qdoctagfiles.cpp | 14 +- src/tools/qdoc/qdoctagfiles.h | 14 +- src/tools/qdoc/qmlcodemarker.cpp | 14 +- src/tools/qdoc/qmlcodemarker.h | 14 +- src/tools/qdoc/qmlcodeparser.cpp | 14 +- src/tools/qdoc/qmlcodeparser.h | 14 +- src/tools/qdoc/qmlmarkupvisitor.cpp | 14 +- src/tools/qdoc/qmlmarkupvisitor.h | 14 +- src/tools/qdoc/qmlparser/qqmljs.g | 42 ++-- src/tools/qdoc/qmlparser/qqmljsast.cpp | 14 +- src/tools/qdoc/qmlparser/qqmljsast_p.h | 14 +- src/tools/qdoc/qmlparser/qqmljsastfwd_p.h | 14 +- src/tools/qdoc/qmlparser/qqmljsastvisitor.cpp | 14 +- src/tools/qdoc/qmlparser/qqmljsastvisitor_p.h | 14 +- src/tools/qdoc/qmlparser/qqmljsengine_p.cpp | 14 +- src/tools/qdoc/qmlparser/qqmljsengine_p.h | 14 +- src/tools/qdoc/qmlparser/qqmljsglobal_p.h | 14 +- src/tools/qdoc/qmlparser/qqmljsgrammar.cpp | 14 +- src/tools/qdoc/qmlparser/qqmljsgrammar_p.h | 14 +- src/tools/qdoc/qmlparser/qqmljskeywords_p.h | 14 +- src/tools/qdoc/qmlparser/qqmljslexer.cpp | 14 +- src/tools/qdoc/qmlparser/qqmljslexer_p.h | 14 +- src/tools/qdoc/qmlparser/qqmljsmemorypool_p.h | 14 +- src/tools/qdoc/qmlparser/qqmljsparser.cpp | 14 +- src/tools/qdoc/qmlparser/qqmljsparser_p.h | 14 +- src/tools/qdoc/qmlvisitor.cpp | 14 +- src/tools/qdoc/qmlvisitor.h | 14 +- src/tools/qdoc/quoter.cpp | 14 +- src/tools/qdoc/quoter.h | 14 +- src/tools/qdoc/separator.cpp | 14 +- src/tools/qdoc/separator.h | 14 +- src/tools/qdoc/text.cpp | 14 +- src/tools/qdoc/text.h | 14 +- src/tools/qdoc/tokenizer.cpp | 14 +- src/tools/qdoc/tokenizer.h | 14 +- src/tools/qdoc/tree.cpp | 14 +- src/tools/qdoc/tree.h | 14 +- src/tools/qdoc/yyindent.cpp | 14 +- src/tools/qlalr/compress.cpp | 14 +- src/tools/qlalr/compress.h | 14 +- src/tools/qlalr/cppgenerator.cpp | 28 +-- src/tools/qlalr/cppgenerator.h | 14 +- src/tools/qlalr/doc/qlalr.qdocconf | 2 +- src/tools/qlalr/doc/src/qlalr.qdoc | 12 +- src/tools/qlalr/dotgraph.cpp | 14 +- src/tools/qlalr/dotgraph.h | 14 +- .../examples/dummy-xml/ll/dummy-xml-ll.cpp | 14 +- src/tools/qlalr/examples/dummy-xml/xml.g | 36 ++- src/tools/qlalr/examples/glsl/build.sh | 38 ++- src/tools/qlalr/examples/glsl/glsl-lex.l | 36 ++- src/tools/qlalr/examples/glsl/glsl.g | 36 ++- src/tools/qlalr/examples/lambda/lambda.g | 36 ++- src/tools/qlalr/examples/lambda/main.cpp | 14 +- src/tools/qlalr/examples/qparser/calc.g | 36 ++- src/tools/qlalr/examples/qparser/calc.l | 38 ++- src/tools/qlalr/examples/qparser/qparser.cpp | 14 +- src/tools/qlalr/examples/qparser/qparser.h | 14 +- src/tools/qlalr/grammar.cpp | 14 +- src/tools/qlalr/grammar_p.h | 14 +- src/tools/qlalr/lalr.cpp | 14 +- src/tools/qlalr/lalr.g | 108 ++++----- src/tools/qlalr/lalr.h | 14 +- src/tools/qlalr/main.cpp | 14 +- src/tools/qlalr/parsetable.cpp | 14 +- src/tools/qlalr/parsetable.h | 14 +- src/tools/qlalr/recognizer.cpp | 14 +- src/tools/qlalr/recognizer.h | 14 +- src/tools/rcc/main.cpp | 14 +- src/tools/rcc/rcc.cpp | 14 +- src/tools/rcc/rcc.h | 14 +- src/tools/uic/cpp/cppextractimages.cpp | 14 +- src/tools/uic/cpp/cppextractimages.h | 14 +- src/tools/uic/cpp/cppwritedeclaration.cpp | 14 +- src/tools/uic/cpp/cppwritedeclaration.h | 14 +- src/tools/uic/cpp/cppwriteicondata.cpp | 14 +- src/tools/uic/cpp/cppwriteicondata.h | 14 +- src/tools/uic/cpp/cppwriteicondeclaration.cpp | 14 +- src/tools/uic/cpp/cppwriteicondeclaration.h | 14 +- .../uic/cpp/cppwriteiconinitialization.cpp | 14 +- .../uic/cpp/cppwriteiconinitialization.h | 14 +- src/tools/uic/cpp/cppwriteincludes.cpp | 14 +- src/tools/uic/cpp/cppwriteincludes.h | 14 +- src/tools/uic/cpp/cppwriteinitialization.cpp | 14 +- src/tools/uic/cpp/cppwriteinitialization.h | 14 +- src/tools/uic/customwidgetsinfo.cpp | 14 +- src/tools/uic/customwidgetsinfo.h | 14 +- src/tools/uic/databaseinfo.cpp | 14 +- src/tools/uic/databaseinfo.h | 14 +- src/tools/uic/driver.cpp | 14 +- src/tools/uic/driver.h | 14 +- src/tools/uic/globaldefs.h | 14 +- src/tools/uic/main.cpp | 14 +- src/tools/uic/option.h | 14 +- src/tools/uic/treewalker.cpp | 14 +- src/tools/uic/treewalker.h | 14 +- src/tools/uic/ui4.cpp | 14 +- src/tools/uic/ui4.h | 14 +- src/tools/uic/uic.cpp | 14 +- src/tools/uic/uic.h | 14 +- src/tools/uic/utils.h | 14 +- src/tools/uic/validator.cpp | 14 +- src/tools/uic/validator.h | 14 +- src/widgets/Qt5WidgetsMacros.cmake | 2 +- src/widgets/accessible/complexwidgets.cpp | 14 +- src/widgets/accessible/complexwidgets.h | 14 +- src/widgets/accessible/itemviews.cpp | 14 +- src/widgets/accessible/itemviews.h | 14 +- src/widgets/accessible/qaccessiblemenu.cpp | 14 +- src/widgets/accessible/qaccessiblemenu.h | 14 +- src/widgets/accessible/qaccessiblewidget.cpp | 14 +- src/widgets/accessible/qaccessiblewidget.h | 14 +- .../accessible/qaccessiblewidgetfactory.cpp | 14 +- .../accessible/qaccessiblewidgetfactory_p.h | 14 +- src/widgets/accessible/qaccessiblewidgets.cpp | 14 +- src/widgets/accessible/qaccessiblewidgets.h | 14 +- src/widgets/accessible/rangecontrols.cpp | 14 +- src/widgets/accessible/rangecontrols.h | 14 +- src/widgets/accessible/simplewidgets.cpp | 14 +- src/widgets/accessible/simplewidgets.h | 14 +- src/widgets/dialogs/qcolordialog.cpp | 14 +- src/widgets/dialogs/qcolordialog.h | 14 +- src/widgets/dialogs/qcolordialog_p.h | 14 +- src/widgets/dialogs/qdialog.cpp | 14 +- src/widgets/dialogs/qdialog.h | 14 +- src/widgets/dialogs/qdialog_p.h | 14 +- src/widgets/dialogs/qerrormessage.cpp | 14 +- src/widgets/dialogs/qerrormessage.h | 14 +- src/widgets/dialogs/qfiledialog.cpp | 14 +- src/widgets/dialogs/qfiledialog.h | 14 +- src/widgets/dialogs/qfiledialog.ui | 36 ++- src/widgets/dialogs/qfiledialog_embedded.ui | 36 ++- src/widgets/dialogs/qfiledialog_p.h | 14 +- src/widgets/dialogs/qfileinfogatherer.cpp | 14 +- src/widgets/dialogs/qfileinfogatherer_p.h | 14 +- src/widgets/dialogs/qfilesystemmodel.cpp | 14 +- src/widgets/dialogs/qfilesystemmodel.h | 14 +- src/widgets/dialogs/qfilesystemmodel_p.h | 14 +- src/widgets/dialogs/qfontdialog.cpp | 14 +- src/widgets/dialogs/qfontdialog.h | 14 +- src/widgets/dialogs/qfontdialog_p.h | 14 +- src/widgets/dialogs/qfscompleter_p.h | 14 +- src/widgets/dialogs/qinputdialog.cpp | 14 +- src/widgets/dialogs/qinputdialog.h | 14 +- src/widgets/dialogs/qmessagebox.cpp | 23 +- src/widgets/dialogs/qmessagebox.h | 14 +- src/widgets/dialogs/qprogressdialog.cpp | 14 +- src/widgets/dialogs/qprogressdialog.h | 14 +- src/widgets/dialogs/qsidebar.cpp | 14 +- src/widgets/dialogs/qsidebar_p.h | 14 +- src/widgets/dialogs/qwizard.cpp | 14 +- src/widgets/dialogs/qwizard.h | 14 +- src/widgets/dialogs/qwizard_win.cpp | 14 +- src/widgets/dialogs/qwizard_win_p.h | 14 +- .../code/doc_gui_widgets_qopenglwidget.cpp | 10 +- .../code/doc_src_examples_dropsite.qdoc | 10 +- .../doc/snippets/code/doc_src_layout.cpp | 10 +- .../code/doc_src_model-view-programming.cpp | 10 +- .../snippets/code/doc_src_qt4-mainwindow.cpp | 10 +- .../doc/snippets/code/doc_src_qt4-styles.cpp | 10 +- .../doc/snippets/code/doc_src_qtwidgets.cpp | 10 +- .../doc/snippets/code/doc_src_styles.cpp | 10 +- .../doc/snippets/code/doc_src_stylesheet.cpp | 10 +- .../doc/snippets/code/doc_src_stylesheet.qdoc | 10 +- .../code/src_gui_dialogs_qfiledialog.cpp | 10 +- .../code/src_gui_dialogs_qfontdialog.cpp | 10 +- .../code/src_gui_dialogs_qmessagebox.cpp | 10 +- .../snippets/code/src_gui_dialogs_qwizard.cpp | 10 +- .../code/src_gui_effects_qgraphicseffect.cpp | 10 +- ...c_gui_graphicsview_qgraphicsgridlayout.cpp | 10 +- .../src_gui_graphicsview_qgraphicsitem.cpp | 10 +- ...gui_graphicsview_qgraphicslinearlayout.cpp | 10 +- ..._gui_graphicsview_qgraphicsproxywidget.cpp | 10 +- .../src_gui_graphicsview_qgraphicsscene.cpp | 10 +- ...c_gui_graphicsview_qgraphicssceneevent.cpp | 10 +- .../src_gui_graphicsview_qgraphicsview.cpp | 10 +- .../src_gui_graphicsview_qgraphicswidget.cpp | 10 +- .../code/src_gui_image_qpixmapfilter.cpp | 10 +- .../src_gui_itemviews_qabstractitemview.cpp | 10 +- .../src_gui_itemviews_qdatawidgetmapper.cpp | 10 +- .../src_gui_itemviews_qitemeditorfactory.cpp | 10 +- .../code/src_gui_itemviews_qtablewidget.cpp | 10 +- .../code/src_gui_itemviews_qtreewidget.cpp | 10 +- .../snippets/code/src_gui_kernel_qaction.cpp | 10 +- .../code/src_gui_kernel_qapplication.cpp | 10 +- .../code/src_gui_kernel_qformlayout.cpp | 10 +- .../snippets/code/src_gui_kernel_qlayout.cpp | 10 +- .../code/src_gui_kernel_qlayoutitem.cpp | 10 +- .../code/src_gui_kernel_qshortcut.cpp | 10 +- .../snippets/code/src_gui_kernel_qwidget.cpp | 10 +- .../code/src_gui_painting_qdrawutil.cpp | 10 +- .../doc/snippets/code/src_gui_qproxystyle.cpp | 10 +- .../snippets/code/src_gui_styles_qstyle.cpp | 10 +- .../code/src_gui_styles_qstyleoption.cpp | 10 +- .../snippets/code/src_gui_util_qcompleter.cpp | 10 +- .../snippets/code/src_gui_util_qundostack.cpp | 10 +- .../code/src_gui_widgets_qabstractbutton.cpp | 10 +- .../code/src_gui_widgets_qabstractspinbox.cpp | 10 +- .../code/src_gui_widgets_qcalendarwidget.cpp | 10 +- .../code/src_gui_widgets_qcheckbox.cpp | 10 +- .../code/src_gui_widgets_qdatetimeedit.cpp | 10 +- .../code/src_gui_widgets_qdockwidget.cpp | 10 +- .../snippets/code/src_gui_widgets_qframe.cpp | 10 +- .../code/src_gui_widgets_qgroupbox.cpp | 10 +- .../snippets/code/src_gui_widgets_qlabel.cpp | 10 +- .../code/src_gui_widgets_qlineedit.cpp | 10 +- .../code/src_gui_widgets_qmainwindow.cpp | 10 +- .../snippets/code/src_gui_widgets_qmenu.cpp | 10 +- .../code/src_gui_widgets_qmenubar.cpp | 10 +- .../code/src_gui_widgets_qplaintextedit.cpp | 10 +- .../code/src_gui_widgets_qpushbutton.cpp | 10 +- .../code/src_gui_widgets_qradiobutton.cpp | 10 +- .../code/src_gui_widgets_qrubberband.cpp | 10 +- .../code/src_gui_widgets_qscrollarea.cpp | 10 +- .../code/src_gui_widgets_qspinbox.cpp | 10 +- .../code/src_gui_widgets_qsplashscreen.cpp | 10 +- .../code/src_gui_widgets_qsplitter.cpp | 10 +- .../code/src_gui_widgets_qstatusbar.cpp | 10 +- .../code/src_gui_widgets_qtextbrowser.cpp | 10 +- .../code/src_gui_widgets_qtextedit.cpp | 10 +- .../doc/snippets/common-table-model/model.cpp | 10 +- .../doc/snippets/common-table-model/model.h | 10 +- .../doc/snippets/customstyle/customstyle.cpp | 10 +- .../doc/snippets/customstyle/customstyle.h | 10 +- src/widgets/doc/snippets/customstyle/main.cpp | 10 +- src/widgets/doc/snippets/customviewstyle.cpp | 10 +- src/widgets/doc/snippets/dialogs/dialogs.cpp | 10 +- .../doc/snippets/dockwidgets/mainwindow.cpp | 10 +- src/widgets/doc/snippets/filedialogurls.cpp | 10 +- .../snippets/graphicssceneadditemsnippet.cpp | 10 +- src/widgets/doc/snippets/graphicsview.cpp | 10 +- .../doc/snippets/itemselection/main.cpp | 10 +- src/widgets/doc/snippets/javastyle.cpp | 10 +- src/widgets/doc/snippets/layouts/layouts.cpp | 10 +- src/widgets/doc/snippets/macmainwindow.mm | 36 ++- .../doc/snippets/mainwindowsnippet.cpp | 10 +- src/widgets/doc/snippets/mdiareasnippets.cpp | 10 +- src/widgets/doc/snippets/myscrollarea.cpp | 10 +- .../doc/snippets/qlistview-dnd/main.cpp | 10 +- .../doc/snippets/qlistview-dnd/mainwindow.cpp | 10 +- .../doc/snippets/qlistview-dnd/mainwindow.h | 10 +- .../doc/snippets/qlistview-dnd/model.cpp | 14 +- .../doc/snippets/qlistview-dnd/model.h | 14 +- .../doc/snippets/qlistwidget-dnd/main.cpp | 10 +- .../snippets/qlistwidget-dnd/mainwindow.cpp | 10 +- .../doc/snippets/qlistwidget-dnd/mainwindow.h | 10 +- .../snippets/qlistwidget-using/mainwindow.cpp | 10 +- .../doc/snippets/qmacnativewidget/main.mm | 10 +- .../snippets/qsortfilterproxymodel/main.cpp | 10 +- .../doc/snippets/qsplashscreen/main.cpp | 10 +- .../doc/snippets/qstackedlayout/main.cpp | 10 +- .../doc/snippets/qstackedwidget/main.cpp | 10 +- .../doc/snippets/qstyleoption/main.cpp | 10 +- .../doc/snippets/qstyleplugin/main.cpp | 10 +- .../qtablewidget-resizing/mainwindow.cpp | 10 +- .../doc/snippets/qtablewidget-using/main.cpp | 10 +- .../qtablewidget-using/mainwindow.cpp | 10 +- .../snippets/qtablewidget-using/mainwindow.h | 10 +- .../snippets/qtreewidget-using/mainwindow.cpp | 10 +- .../mainwindow.cpp | 10 +- .../doc/snippets/reading-selections/main.cpp | 10 +- .../snippets/reading-selections/window.cpp | 10 +- .../doc/snippets/reading-selections/window.h | 10 +- .../doc/snippets/shareddirmodel/main.cpp | 10 +- .../doc/snippets/sharedtablemodel/main.cpp | 10 +- .../doc/snippets/simplemodel-use/main.cpp | 10 +- .../doc/snippets/splitter/splitter.cpp | 10 +- .../doc/snippets/splitterhandle/splitter.cpp | 10 +- .../doc/snippets/splitterhandle/splitter.h | 10 +- .../doc/snippets/stringlistmodel/main.cpp | 10 +- .../doc/snippets/stringlistmodel/model.cpp | 10 +- .../doc/snippets/stringlistmodel/model.h | 10 +- src/widgets/doc/snippets/styles/styles.cpp | 10 +- .../snippets/stylesheet/common-mistakes.cpp | 10 +- .../textdocument-imagedrop/textedit.cpp | 10 +- src/widgets/doc/snippets/timeline/main.cpp | 10 +- .../doc/snippets/updating-selections/main.cpp | 10 +- .../snippets/updating-selections/window.cpp | 10 +- .../doc/snippets/updating-selections/window.h | 10 +- .../doc/snippets/whatsthis/whatsthis.cpp | 10 +- src/widgets/doc/snippets/widget-mask/main.cpp | 10 +- src/widgets/doc/snippets/widgetdelegate.cpp | 10 +- .../snippets/widgets-tutorial/template.cpp | 10 +- src/widgets/doc/src/external-resources.qdoc | 12 +- src/widgets/doc/src/gestures.qdoc | 12 +- src/widgets/doc/src/graphicsview.qdoc | 12 +- src/widgets/doc/src/guibooks.qdoc | 12 +- .../doc/src/model-view-programming.qdoc | 12 +- src/widgets/doc/src/modelview.qdoc | 12 +- src/widgets/doc/src/qtwidgets-examples.qdoc | 12 +- src/widgets/doc/src/qtwidgets-index.qdoc | 12 +- src/widgets/doc/src/qtwidgets.qdoc | 12 +- .../doc/src/widgets-and-layouts/focus.qdoc | 12 +- .../widgets-and-layouts/gallery-fusion.qdoc | 12 +- .../src/widgets-and-layouts/gallery-gtk.qdoc | 12 +- .../gallery-macintosh.qdoc | 12 +- .../widgets-and-layouts/gallery-windows.qdoc | 12 +- .../gallery-windowsvista.qdoc | 12 +- .../gallery-windowsxp.qdoc | 12 +- .../doc/src/widgets-and-layouts/gallery.qdoc | 12 +- .../doc/src/widgets-and-layouts/layout.qdoc | 12 +- .../doc/src/widgets-and-layouts/styles.qdoc | 12 +- .../src/widgets-and-layouts/stylesheet.qdoc | 12 +- .../doc/src/widgets-and-layouts/widgets.qdoc | 12 +- src/widgets/doc/src/widgets-tutorial.qdoc | 12 +- .../doc/src/windows-and-dialogs/dialogs.qdoc | 12 +- .../src/windows-and-dialogs/mainwindow.qdoc | 12 +- src/widgets/effects/qgraphicseffect.cpp | 14 +- src/widgets/effects/qgraphicseffect.h | 14 +- src/widgets/effects/qgraphicseffect_p.h | 14 +- src/widgets/effects/qpixmapfilter.cpp | 14 +- src/widgets/effects/qpixmapfilter_p.h | 14 +- src/widgets/graphicsview/qgraph_p.h | 14 +- .../graphicsview/qgraphicsanchorlayout.cpp | 14 +- .../graphicsview/qgraphicsanchorlayout.h | 14 +- .../graphicsview/qgraphicsanchorlayout_p.cpp | 14 +- .../graphicsview/qgraphicsanchorlayout_p.h | 14 +- .../graphicsview/qgraphicsgridlayout.cpp | 14 +- .../graphicsview/qgraphicsgridlayout.h | 14 +- .../qgraphicsgridlayoutengine.cpp | 14 +- .../qgraphicsgridlayoutengine_p.h | 14 +- src/widgets/graphicsview/qgraphicsitem.cpp | 14 +- src/widgets/graphicsview/qgraphicsitem.h | 14 +- src/widgets/graphicsview/qgraphicsitem_p.h | 14 +- .../graphicsview/qgraphicsitemanimation.cpp | 14 +- .../graphicsview/qgraphicsitemanimation.h | 14 +- src/widgets/graphicsview/qgraphicslayout.cpp | 14 +- src/widgets/graphicsview/qgraphicslayout.h | 14 +- .../graphicsview/qgraphicslayout_p.cpp | 14 +- src/widgets/graphicsview/qgraphicslayout_p.h | 14 +- .../graphicsview/qgraphicslayoutitem.cpp | 14 +- .../graphicsview/qgraphicslayoutitem.h | 14 +- .../graphicsview/qgraphicslayoutitem_p.h | 14 +- .../graphicsview/qgraphicslayoutstyleinfo.cpp | 14 +- .../graphicsview/qgraphicslayoutstyleinfo_p.h | 14 +- .../graphicsview/qgraphicslinearlayout.cpp | 14 +- .../graphicsview/qgraphicslinearlayout.h | 14 +- .../graphicsview/qgraphicsproxywidget.cpp | 14 +- .../graphicsview/qgraphicsproxywidget.h | 14 +- .../graphicsview/qgraphicsproxywidget_p.h | 14 +- src/widgets/graphicsview/qgraphicsscene.cpp | 14 +- src/widgets/graphicsview/qgraphicsscene.h | 14 +- .../graphicsview/qgraphicsscene_bsp.cpp | 14 +- .../graphicsview/qgraphicsscene_bsp_p.h | 14 +- src/widgets/graphicsview/qgraphicsscene_p.h | 14 +- .../qgraphicsscenebsptreeindex.cpp | 14 +- .../qgraphicsscenebsptreeindex_p.h | 14 +- .../graphicsview/qgraphicssceneevent.cpp | 14 +- .../graphicsview/qgraphicssceneevent.h | 14 +- .../graphicsview/qgraphicssceneindex.cpp | 14 +- .../graphicsview/qgraphicssceneindex_p.h | 14 +- .../qgraphicsscenelinearindex.cpp | 14 +- .../qgraphicsscenelinearindex_p.h | 14 +- .../graphicsview/qgraphicstransform.cpp | 14 +- src/widgets/graphicsview/qgraphicstransform.h | 14 +- .../graphicsview/qgraphicstransform_p.h | 14 +- src/widgets/graphicsview/qgraphicsview.cpp | 14 +- src/widgets/graphicsview/qgraphicsview.h | 14 +- src/widgets/graphicsview/qgraphicsview_p.h | 14 +- src/widgets/graphicsview/qgraphicswidget.cpp | 14 +- src/widgets/graphicsview/qgraphicswidget.h | 14 +- .../graphicsview/qgraphicswidget_p.cpp | 14 +- src/widgets/graphicsview/qgraphicswidget_p.h | 14 +- src/widgets/graphicsview/qsimplex_p.cpp | 14 +- src/widgets/graphicsview/qsimplex_p.h | 14 +- .../itemviews/qabstractitemdelegate.cpp | 14 +- src/widgets/itemviews/qabstractitemdelegate.h | 14 +- .../itemviews/qabstractitemdelegate_p.h | 14 +- src/widgets/itemviews/qabstractitemview.cpp | 14 +- src/widgets/itemviews/qabstractitemview.h | 14 +- src/widgets/itemviews/qabstractitemview_p.h | 14 +- src/widgets/itemviews/qbsptree.cpp | 14 +- src/widgets/itemviews/qbsptree_p.h | 14 +- src/widgets/itemviews/qcolumnview.cpp | 14 +- src/widgets/itemviews/qcolumnview.h | 14 +- src/widgets/itemviews/qcolumnview_p.h | 14 +- src/widgets/itemviews/qcolumnviewgrip.cpp | 14 +- src/widgets/itemviews/qcolumnviewgrip_p.h | 14 +- src/widgets/itemviews/qdatawidgetmapper.cpp | 14 +- src/widgets/itemviews/qdatawidgetmapper.h | 14 +- src/widgets/itemviews/qdirmodel.cpp | 14 +- src/widgets/itemviews/qdirmodel.h | 14 +- src/widgets/itemviews/qfileiconprovider.cpp | 14 +- src/widgets/itemviews/qfileiconprovider.h | 14 +- src/widgets/itemviews/qfileiconprovider_p.h | 14 +- src/widgets/itemviews/qheaderview.cpp | 14 +- src/widgets/itemviews/qheaderview.h | 14 +- src/widgets/itemviews/qheaderview_p.h | 14 +- src/widgets/itemviews/qitemdelegate.cpp | 14 +- src/widgets/itemviews/qitemdelegate.h | 14 +- src/widgets/itemviews/qitemeditorfactory.cpp | 14 +- src/widgets/itemviews/qitemeditorfactory.h | 14 +- src/widgets/itemviews/qitemeditorfactory_p.h | 14 +- src/widgets/itemviews/qlistview.cpp | 14 +- src/widgets/itemviews/qlistview.h | 14 +- src/widgets/itemviews/qlistview_p.h | 14 +- src/widgets/itemviews/qlistwidget.cpp | 14 +- src/widgets/itemviews/qlistwidget.h | 14 +- src/widgets/itemviews/qlistwidget_p.h | 14 +- src/widgets/itemviews/qstyleditemdelegate.cpp | 14 +- src/widgets/itemviews/qstyleditemdelegate.h | 14 +- src/widgets/itemviews/qtableview.cpp | 14 +- src/widgets/itemviews/qtableview.h | 14 +- src/widgets/itemviews/qtableview_p.h | 14 +- src/widgets/itemviews/qtablewidget.cpp | 14 +- src/widgets/itemviews/qtablewidget.h | 14 +- src/widgets/itemviews/qtablewidget_p.h | 14 +- src/widgets/itemviews/qtreeview.cpp | 14 +- src/widgets/itemviews/qtreeview.h | 14 +- src/widgets/itemviews/qtreeview_p.h | 14 +- src/widgets/itemviews/qtreewidget.cpp | 14 +- src/widgets/itemviews/qtreewidget.h | 14 +- src/widgets/itemviews/qtreewidget_p.h | 14 +- .../itemviews/qtreewidgetitemiterator.cpp | 14 +- .../itemviews/qtreewidgetitemiterator.h | 14 +- .../itemviews/qtreewidgetitemiterator_p.h | 14 +- src/widgets/itemviews/qwidgetitemdata_p.h | 14 +- src/widgets/kernel/qaction.cpp | 14 +- src/widgets/kernel/qaction.h | 14 +- src/widgets/kernel/qaction_p.h | 14 +- src/widgets/kernel/qactiongroup.cpp | 14 +- src/widgets/kernel/qactiongroup.h | 14 +- src/widgets/kernel/qapplication.cpp | 14 +- src/widgets/kernel/qapplication.h | 14 +- src/widgets/kernel/qapplication_p.h | 14 +- src/widgets/kernel/qboxlayout.cpp | 14 +- src/widgets/kernel/qboxlayout.h | 14 +- src/widgets/kernel/qdesktopwidget.cpp | 14 +- src/widgets/kernel/qdesktopwidget.h | 14 +- src/widgets/kernel/qdesktopwidget.qdoc | 12 +- src/widgets/kernel/qdesktopwidget_p.h | 14 +- src/widgets/kernel/qformlayout.cpp | 14 +- src/widgets/kernel/qformlayout.h | 14 +- src/widgets/kernel/qgesture.cpp | 14 +- src/widgets/kernel/qgesture.h | 14 +- src/widgets/kernel/qgesture_p.h | 14 +- src/widgets/kernel/qgesturemanager.cpp | 14 +- src/widgets/kernel/qgesturemanager_p.h | 14 +- src/widgets/kernel/qgesturerecognizer.cpp | 14 +- src/widgets/kernel/qgesturerecognizer.h | 14 +- src/widgets/kernel/qgridlayout.cpp | 14 +- src/widgets/kernel/qgridlayout.h | 14 +- src/widgets/kernel/qlayout.cpp | 14 +- src/widgets/kernel/qlayout.h | 14 +- src/widgets/kernel/qlayout_p.h | 14 +- src/widgets/kernel/qlayoutengine.cpp | 14 +- src/widgets/kernel/qlayoutengine_p.h | 14 +- src/widgets/kernel/qlayoutitem.cpp | 14 +- src/widgets/kernel/qlayoutitem.h | 14 +- src/widgets/kernel/qmacgesturerecognizer.cpp | 14 +- src/widgets/kernel/qmacgesturerecognizer_p.h | 14 +- src/widgets/kernel/qopenglwidget.cpp | 14 +- src/widgets/kernel/qopenglwidget.h | 14 +- src/widgets/kernel/qshortcut.cpp | 14 +- src/widgets/kernel/qshortcut.h | 14 +- src/widgets/kernel/qsizepolicy.h | 14 +- src/widgets/kernel/qsizepolicy.qdoc | 12 +- src/widgets/kernel/qstackedlayout.cpp | 14 +- src/widgets/kernel/qstackedlayout.h | 14 +- src/widgets/kernel/qstandardgestures.cpp | 14 +- src/widgets/kernel/qstandardgestures_p.h | 14 +- src/widgets/kernel/qt_widgets_pch.h | 14 +- src/widgets/kernel/qtooltip.cpp | 14 +- src/widgets/kernel/qtooltip.h | 14 +- src/widgets/kernel/qwhatsthis.cpp | 14 +- src/widgets/kernel/qwhatsthis.h | 14 +- src/widgets/kernel/qwidget.cpp | 14 +- src/widgets/kernel/qwidget.h | 14 +- src/widgets/kernel/qwidget_p.h | 14 +- src/widgets/kernel/qwidgetaction.cpp | 14 +- src/widgets/kernel/qwidgetaction.h | 14 +- src/widgets/kernel/qwidgetaction_p.h | 14 +- src/widgets/kernel/qwidgetbackingstore.cpp | 14 +- src/widgets/kernel/qwidgetbackingstore_p.h | 14 +- .../kernel/qwidgetsfunctions_wince.cpp | 14 +- src/widgets/kernel/qwidgetsfunctions_wince.h | 14 +- src/widgets/kernel/qwidgetsvariant.cpp | 14 +- src/widgets/kernel/qwidgetwindow.cpp | 14 +- src/widgets/kernel/qwidgetwindow_p.h | 14 +- src/widgets/kernel/qwindowcontainer.cpp | 14 +- src/widgets/kernel/qwindowcontainer_p.h | 14 +- .../statemachine/qbasickeyeventtransition.cpp | 14 +- .../statemachine/qbasickeyeventtransition_p.h | 14 +- .../qbasicmouseeventtransition.cpp | 14 +- .../qbasicmouseeventtransition_p.h | 14 +- src/widgets/statemachine/qguistatemachine.cpp | 14 +- .../statemachine/qkeyeventtransition.cpp | 14 +- .../statemachine/qkeyeventtransition.h | 14 +- .../statemachine/qmouseeventtransition.cpp | 14 +- .../statemachine/qmouseeventtransition.h | 14 +- src/widgets/styles/qandroidstyle.cpp | 12 +- src/widgets/styles/qandroidstyle_p.h | 12 +- src/widgets/styles/qcommonstyle.cpp | 14 +- src/widgets/styles/qcommonstyle.h | 14 +- src/widgets/styles/qcommonstyle_p.h | 14 +- src/widgets/styles/qcommonstylepixmaps_p.h | 14 +- src/widgets/styles/qdrawutil.cpp | 14 +- src/widgets/styles/qdrawutil.h | 14 +- src/widgets/styles/qfusionstyle.cpp | 14 +- src/widgets/styles/qfusionstyle_p.h | 14 +- src/widgets/styles/qfusionstyle_p_p.h | 14 +- src/widgets/styles/qgtk2painter.cpp | 14 +- src/widgets/styles/qgtk2painter_p.h | 14 +- src/widgets/styles/qgtkglobal_p.h | 14 +- src/widgets/styles/qgtkpainter.cpp | 14 +- src/widgets/styles/qgtkpainter_p.h | 14 +- src/widgets/styles/qgtkstyle.cpp | 14 +- src/widgets/styles/qgtkstyle_p.cpp | 14 +- src/widgets/styles/qgtkstyle_p.h | 14 +- src/widgets/styles/qgtkstyle_p_p.h | 14 +- src/widgets/styles/qmacstyle.qdoc | 12 +- src/widgets/styles/qmacstyle_mac.mm | 36 ++- src/widgets/styles/qmacstyle_mac_p.h | 14 +- src/widgets/styles/qmacstyle_mac_p_p.h | 14 +- src/widgets/styles/qproxystyle.cpp | 14 +- src/widgets/styles/qproxystyle.h | 14 +- src/widgets/styles/qproxystyle_p.h | 14 +- src/widgets/styles/qstyle.cpp | 14 +- src/widgets/styles/qstyle.h | 14 +- src/widgets/styles/qstyle_p.h | 14 +- src/widgets/styles/qstyleanimation.cpp | 14 +- src/widgets/styles/qstyleanimation_p.h | 14 +- src/widgets/styles/qstylefactory.cpp | 14 +- src/widgets/styles/qstylefactory.h | 14 +- src/widgets/styles/qstylehelper.cpp | 14 +- src/widgets/styles/qstylehelper_p.h | 14 +- src/widgets/styles/qstyleoption.cpp | 14 +- src/widgets/styles/qstyleoption.h | 14 +- src/widgets/styles/qstylepainter.cpp | 14 +- src/widgets/styles/qstylepainter.h | 14 +- src/widgets/styles/qstyleplugin.cpp | 14 +- src/widgets/styles/qstyleplugin.h | 14 +- src/widgets/styles/qstylesheetstyle.cpp | 14 +- .../styles/qstylesheetstyle_default.cpp | 14 +- src/widgets/styles/qstylesheetstyle_p.h | 14 +- src/widgets/styles/qwindowscestyle.cpp | 14 +- src/widgets/styles/qwindowscestyle_p.h | 14 +- src/widgets/styles/qwindowscestyle_p_p.h | 14 +- src/widgets/styles/qwindowsmobilestyle.cpp | 14 +- src/widgets/styles/qwindowsmobilestyle_p.h | 14 +- src/widgets/styles/qwindowsmobilestyle_p_p.h | 14 +- src/widgets/styles/qwindowsstyle.cpp | 14 +- src/widgets/styles/qwindowsstyle_p.h | 14 +- src/widgets/styles/qwindowsstyle_p_p.h | 14 +- src/widgets/styles/qwindowsvistastyle.cpp | 14 +- src/widgets/styles/qwindowsvistastyle_p.h | 14 +- src/widgets/styles/qwindowsvistastyle_p_p.h | 14 +- src/widgets/styles/qwindowsxpstyle.cpp | 14 +- src/widgets/styles/qwindowsxpstyle_p.h | 14 +- src/widgets/styles/qwindowsxpstyle_p_p.h | 14 +- src/widgets/util/qcolormap.cpp | 14 +- src/widgets/util/qcolormap.h | 14 +- src/widgets/util/qcolormap.qdoc | 12 +- src/widgets/util/qcompleter.cpp | 14 +- src/widgets/util/qcompleter.h | 14 +- src/widgets/util/qcompleter_p.h | 14 +- src/widgets/util/qflickgesture.cpp | 14 +- src/widgets/util/qflickgesture_p.h | 14 +- src/widgets/util/qscroller.cpp | 14 +- src/widgets/util/qscroller.h | 14 +- src/widgets/util/qscroller_mac.mm | 36 ++- src/widgets/util/qscroller_p.h | 14 +- src/widgets/util/qscrollerproperties.cpp | 14 +- src/widgets/util/qscrollerproperties.h | 14 +- src/widgets/util/qscrollerproperties_p.h | 14 +- src/widgets/util/qsystemtrayicon.cpp | 14 +- src/widgets/util/qsystemtrayicon.h | 14 +- src/widgets/util/qsystemtrayicon_p.h | 14 +- src/widgets/util/qsystemtrayicon_qpa.cpp | 14 +- src/widgets/util/qsystemtrayicon_win.cpp | 14 +- src/widgets/util/qsystemtrayicon_wince.cpp | 14 +- src/widgets/util/qsystemtrayicon_x11.cpp | 14 +- src/widgets/util/qundogroup.cpp | 14 +- src/widgets/util/qundogroup.h | 14 +- src/widgets/util/qundostack.cpp | 14 +- src/widgets/util/qundostack.h | 14 +- src/widgets/util/qundostack_p.h | 14 +- src/widgets/util/qundoview.cpp | 14 +- src/widgets/util/qundoview.h | 14 +- src/widgets/widgets/qabstractbutton.cpp | 14 +- src/widgets/widgets/qabstractbutton.h | 14 +- src/widgets/widgets/qabstractbutton_p.h | 14 +- src/widgets/widgets/qabstractscrollarea.cpp | 14 +- src/widgets/widgets/qabstractscrollarea.h | 14 +- src/widgets/widgets/qabstractscrollarea_p.h | 14 +- src/widgets/widgets/qabstractslider.cpp | 14 +- src/widgets/widgets/qabstractslider.h | 14 +- src/widgets/widgets/qabstractslider_p.h | 14 +- src/widgets/widgets/qabstractspinbox.cpp | 14 +- src/widgets/widgets/qabstractspinbox.h | 14 +- src/widgets/widgets/qabstractspinbox_p.h | 14 +- src/widgets/widgets/qbuttongroup.cpp | 14 +- src/widgets/widgets/qbuttongroup.h | 14 +- src/widgets/widgets/qcalendarwidget.cpp | 14 +- src/widgets/widgets/qcalendarwidget.h | 14 +- src/widgets/widgets/qcheckbox.cpp | 14 +- src/widgets/widgets/qcheckbox.h | 14 +- src/widgets/widgets/qcombobox.cpp | 14 +- src/widgets/widgets/qcombobox.h | 14 +- src/widgets/widgets/qcombobox_p.h | 14 +- src/widgets/widgets/qcommandlinkbutton.cpp | 14 +- src/widgets/widgets/qcommandlinkbutton.h | 14 +- src/widgets/widgets/qdatetimeedit.cpp | 14 +- src/widgets/widgets/qdatetimeedit.h | 14 +- src/widgets/widgets/qdatetimeedit_p.h | 14 +- src/widgets/widgets/qdial.cpp | 14 +- src/widgets/widgets/qdial.h | 14 +- src/widgets/widgets/qdialogbuttonbox.cpp | 14 +- src/widgets/widgets/qdialogbuttonbox.h | 14 +- src/widgets/widgets/qdockarealayout.cpp | 14 +- src/widgets/widgets/qdockarealayout_p.h | 14 +- src/widgets/widgets/qdockwidget.cpp | 14 +- src/widgets/widgets/qdockwidget.h | 14 +- src/widgets/widgets/qdockwidget_p.h | 14 +- src/widgets/widgets/qeffects.cpp | 14 +- src/widgets/widgets/qeffects_p.h | 14 +- src/widgets/widgets/qfocusframe.cpp | 14 +- src/widgets/widgets/qfocusframe.h | 14 +- src/widgets/widgets/qfontcombobox.cpp | 14 +- src/widgets/widgets/qfontcombobox.h | 14 +- src/widgets/widgets/qframe.cpp | 14 +- src/widgets/widgets/qframe.h | 14 +- src/widgets/widgets/qframe_p.h | 14 +- src/widgets/widgets/qgroupbox.cpp | 14 +- src/widgets/widgets/qgroupbox.h | 14 +- src/widgets/widgets/qkeysequenceedit.cpp | 14 +- src/widgets/widgets/qkeysequenceedit.h | 14 +- src/widgets/widgets/qkeysequenceedit_p.h | 14 +- src/widgets/widgets/qlabel.cpp | 14 +- src/widgets/widgets/qlabel.h | 14 +- src/widgets/widgets/qlabel_p.h | 14 +- src/widgets/widgets/qlcdnumber.cpp | 14 +- src/widgets/widgets/qlcdnumber.h | 14 +- src/widgets/widgets/qlineedit.cpp | 14 +- src/widgets/widgets/qlineedit.h | 14 +- src/widgets/widgets/qlineedit_p.cpp | 14 +- src/widgets/widgets/qlineedit_p.h | 14 +- .../widgets/qmaccocoaviewcontainer_mac.h | 14 +- .../widgets/qmaccocoaviewcontainer_mac.mm | 36 ++- src/widgets/widgets/qmacnativewidget_mac.h | 14 +- src/widgets/widgets/qmacnativewidget_mac.mm | 36 ++- src/widgets/widgets/qmainwindow.cpp | 14 +- src/widgets/widgets/qmainwindow.h | 14 +- src/widgets/widgets/qmainwindowlayout.cpp | 14 +- src/widgets/widgets/qmainwindowlayout_p.h | 14 +- src/widgets/widgets/qmdiarea.cpp | 14 +- src/widgets/widgets/qmdiarea.h | 14 +- src/widgets/widgets/qmdiarea_p.h | 14 +- src/widgets/widgets/qmdisubwindow.cpp | 14 +- src/widgets/widgets/qmdisubwindow.h | 14 +- src/widgets/widgets/qmdisubwindow_p.h | 14 +- src/widgets/widgets/qmenu.cpp | 14 +- src/widgets/widgets/qmenu.h | 14 +- src/widgets/widgets/qmenu_mac.mm | 36 ++- src/widgets/widgets/qmenu_p.h | 14 +- src/widgets/widgets/qmenu_wince.cpp | 14 +- src/widgets/widgets/qmenu_wince_resource_p.h | 14 +- src/widgets/widgets/qmenubar.cpp | 14 +- src/widgets/widgets/qmenubar.h | 14 +- src/widgets/widgets/qmenubar_p.h | 14 +- src/widgets/widgets/qplaintextedit.cpp | 14 +- src/widgets/widgets/qplaintextedit.h | 14 +- src/widgets/widgets/qplaintextedit_p.h | 14 +- src/widgets/widgets/qprogressbar.cpp | 14 +- src/widgets/widgets/qprogressbar.h | 14 +- src/widgets/widgets/qpushbutton.cpp | 14 +- src/widgets/widgets/qpushbutton.h | 14 +- src/widgets/widgets/qpushbutton_p.h | 14 +- src/widgets/widgets/qradiobutton.cpp | 14 +- src/widgets/widgets/qradiobutton.h | 14 +- src/widgets/widgets/qrubberband.cpp | 14 +- src/widgets/widgets/qrubberband.h | 14 +- src/widgets/widgets/qscrollarea.cpp | 14 +- src/widgets/widgets/qscrollarea.h | 14 +- src/widgets/widgets/qscrollarea_p.h | 14 +- src/widgets/widgets/qscrollbar.cpp | 14 +- src/widgets/widgets/qscrollbar.h | 14 +- src/widgets/widgets/qscrollbar_p.h | 14 +- src/widgets/widgets/qsizegrip.cpp | 14 +- src/widgets/widgets/qsizegrip.h | 14 +- src/widgets/widgets/qslider.cpp | 14 +- src/widgets/widgets/qslider.h | 14 +- src/widgets/widgets/qspinbox.cpp | 14 +- src/widgets/widgets/qspinbox.h | 14 +- src/widgets/widgets/qsplashscreen.cpp | 14 +- src/widgets/widgets/qsplashscreen.h | 14 +- src/widgets/widgets/qsplitter.cpp | 14 +- src/widgets/widgets/qsplitter.h | 14 +- src/widgets/widgets/qsplitter_p.h | 14 +- src/widgets/widgets/qstackedwidget.cpp | 14 +- src/widgets/widgets/qstackedwidget.h | 14 +- src/widgets/widgets/qstatusbar.cpp | 14 +- src/widgets/widgets/qstatusbar.h | 14 +- src/widgets/widgets/qtabbar.cpp | 14 +- src/widgets/widgets/qtabbar.h | 14 +- src/widgets/widgets/qtabbar_p.h | 14 +- src/widgets/widgets/qtabwidget.cpp | 14 +- src/widgets/widgets/qtabwidget.h | 14 +- src/widgets/widgets/qtextbrowser.cpp | 14 +- src/widgets/widgets/qtextbrowser.h | 14 +- src/widgets/widgets/qtextedit.cpp | 14 +- src/widgets/widgets/qtextedit.h | 14 +- src/widgets/widgets/qtextedit_p.h | 14 +- src/widgets/widgets/qtoolbar.cpp | 14 +- src/widgets/widgets/qtoolbar.h | 14 +- src/widgets/widgets/qtoolbar_p.h | 14 +- src/widgets/widgets/qtoolbararealayout.cpp | 14 +- src/widgets/widgets/qtoolbararealayout_p.h | 14 +- src/widgets/widgets/qtoolbarextension.cpp | 14 +- src/widgets/widgets/qtoolbarextension_p.h | 14 +- src/widgets/widgets/qtoolbarlayout.cpp | 14 +- src/widgets/widgets/qtoolbarlayout_p.h | 14 +- src/widgets/widgets/qtoolbarseparator.cpp | 14 +- src/widgets/widgets/qtoolbarseparator_p.h | 14 +- src/widgets/widgets/qtoolbox.cpp | 14 +- src/widgets/widgets/qtoolbox.h | 14 +- src/widgets/widgets/qtoolbutton.cpp | 14 +- src/widgets/widgets/qtoolbutton.h | 14 +- src/widgets/widgets/qwidgetanimator.cpp | 14 +- src/widgets/widgets/qwidgetanimator_p.h | 14 +- src/widgets/widgets/qwidgetlinecontrol.cpp | 14 +- src/widgets/widgets/qwidgetlinecontrol_p.h | 14 +- src/widgets/widgets/qwidgetresizehandler.cpp | 14 +- src/widgets/widgets/qwidgetresizehandler_p.h | 14 +- src/widgets/widgets/qwidgettextcontrol.cpp | 14 +- src/widgets/widgets/qwidgettextcontrol_p.h | 14 +- src/widgets/widgets/qwidgettextcontrol_p_p.h | 14 +- src/winmain/qtmain_win.cpp | 10 +- src/winmain/qtmain_winrt.cpp | 10 +- src/xml/doc/snippets/code/doc_src_qtxml.cpp | 10 +- src/xml/doc/snippets/code/doc_src_qtxml.qdoc | 10 +- .../doc/snippets/code/src_xml_dom_qdom.cpp | 10 +- .../doc/snippets/code/src_xml_sax_qxml.cpp | 10 +- src/xml/doc/snippets/rsslisting/handler.cpp | 10 +- src/xml/doc/snippets/rsslisting/listing.cpp | 10 +- src/xml/doc/snippets/simpleparse/main.cpp | 10 +- src/xml/doc/src/external-resources.qdoc | 12 +- src/xml/doc/src/qtxml-index.qdoc | 12 +- src/xml/doc/src/qtxml.qdoc | 12 +- src/xml/doc/src/xml-processing.qdoc | 12 +- src/xml/dom/qdom.cpp | 40 ++-- src/xml/dom/qdom.h | 14 +- src/xml/qtxmlglobal.h | 12 +- src/xml/sax/qxml.cpp | 14 +- src/xml/sax/qxml.h | 14 +- src/xml/sax/qxml_p.h | 14 +- .../auto/android/runtests_androiddeployqt.pl | 14 +- .../test(needsquoting)dirname/mywidget.cpp | 12 +- .../test(needsquoting)dirname/mywidget.h | 12 +- .../test_add_resource_options/myobject.cpp | 12 +- .../test_add_resource_options/myobject.h | 12 +- .../test_add_resources_delayed_file/main.cpp | 12 +- .../cmake/test_concurrent_module/main.cpp | 12 +- .../cmake/test_dbus_module/mydbusobject.cpp | 12 +- .../cmake/test_dbus_module/mydbusobject.h | 12 +- .../cmake/test_dependent_modules/mywidget.cpp | 12 +- .../cmake/test_dependent_modules/mywidget.h | 12 +- tests/auto/cmake/test_egl_lib/main.cpp | 12 +- tests/auto/cmake/test_interface/main.cpp | 12 +- .../auto/cmake/test_interface/mainwindow.cpp | 12 +- tests/auto/cmake/test_interface/mainwindow.h | 12 +- .../test_interface_link_libraries/main.cpp | 12 +- .../test_interface_link_libraries/somelib.cpp | 12 +- .../test_interface_link_libraries/somelib.h | 12 +- .../test_json_plugin_includes/plugin.cpp | 12 +- .../cmake/test_json_plugin_includes/plugin.h | 12 +- .../interface/myinterface.h | 12 +- .../test_moc_macro_target/main_gen_test.cpp | 12 +- .../test_moc_macro_target/main_wrap_test.cpp | 12 +- .../test_moc_macro_target/mywrapobject.h | 12 +- .../cmake/test_multiple_find_package/main.cpp | 12 +- tests/auto/cmake/test_opengl_lib/main.cpp | 12 +- .../test_openglextensions_module/main.cpp | 12 +- .../cmake/test_platform_defs_include/main.cpp | 12 +- .../auto/cmake/test_private_includes/main.cpp | 12 +- .../cmake/test_qtmainwin_library/myobject.cpp | 12 +- .../cmake/test_qtmainwin_library/myobject.h | 12 +- .../cmake/test_testlib_definitions/main.cpp | 12 +- .../cmake/test_use_modules_function/three.cpp | 12 +- .../cmake/test_use_modules_function/two.cpp | 12 +- .../test_wrap_cpp_and_resources/myobject.cpp | 12 +- .../test_wrap_cpp_and_resources/myobject.h | 12 +- .../cmake/test_wrap_cpp_options/myobject.cpp | 12 +- .../cmake/test_wrap_cpp_options/myobject.h | 12 +- tests/auto/compilerwarnings/data/test_cpp.txt | 38 ++- .../tst_qtconcurrentfilter.cpp | 14 +- .../tst_qtconcurrentiteratekernel.cpp | 14 +- .../concurrent/qtconcurrentmap/functions.h | 14 +- .../qtconcurrentmap/tst_qtconcurrentmap.cpp | 14 +- .../tst_qtconcurrentmedian.cpp | 14 +- .../qtconcurrentrun/tst_qtconcurrentrun.cpp | 14 +- .../tst_qtconcurrentthreadengine.cpp | 14 +- .../tst_qabstractanimation.cpp | 14 +- .../qanimationgroup/tst_qanimationgroup.cpp | 14 +- .../tst_qparallelanimationgroup.cpp | 14 +- .../qpauseanimation/tst_qpauseanimation.cpp | 14 +- .../tst_qpropertyanimation.cpp | 14 +- .../tst_qsequentialanimationgroup.cpp | 14 +- .../tst_qvariantanimation.cpp | 14 +- .../corelib/codecs/qtextcodec/echo/main.cpp | 14 +- .../codecs/qtextcodec/tst_qtextcodec.cpp | 14 +- tests/auto/corelib/codecs/utf8/tst_utf8.cpp | 14 +- tests/auto/corelib/codecs/utf8/utf8data.cpp | 14 +- .../global/q_func_info/tst_q_func_info.cpp | 14 +- .../auto/corelib/global/qflags/tst_qflags.cpp | 14 +- .../global/qgetputenv/tst_qgetputenv.cpp | 14 +- .../corelib/global/qglobal/tst_qglobal.cpp | 14 +- .../qglobalstatic/tst_qglobalstatic.cpp | 8 +- .../auto/corelib/global/qhooks/tst_qhooks.cpp | 12 +- .../auto/corelib/global/qlogging/app/main.cpp | 14 +- .../corelib/global/qlogging/tst_qlogging.cpp | 14 +- .../corelib/global/qnumeric/tst_qnumeric.cpp | 14 +- tests/auto/corelib/global/qrand/tst_qrand.cpp | 14 +- .../corelib/global/qtendian/tst_qtendian.cpp | 14 +- .../corelib/io/largefile/tst_largefile.cpp | 14 +- .../tst_qabstractfileengine.cpp | 14 +- tests/auto/corelib/io/qbuffer/tst_qbuffer.cpp | 14 +- .../io/qdatastream/tst_qdatastream.cpp | 14 +- .../auto/corelib/io/qdataurl/tst_qdataurl.cpp | 14 +- tests/auto/corelib/io/qdebug/tst_qdebug.cpp | 14 +- .../corelib/io/qdir/testdir/dir/qrc_qdir.cpp | 14 +- .../corelib/io/qdir/testdir/dir/tst_qdir.cpp | 14 +- tests/auto/corelib/io/qdir/tst_qdir.cpp | 14 +- .../io/qdiriterator/tst_qdiriterator.cpp | 14 +- .../corelib/io/qfile/stdinprocess/main.cpp | 14 +- tests/auto/corelib/io/qfile/tst_qfile.cpp | 14 +- .../corelib/io/qfileinfo/tst_qfileinfo.cpp | 14 +- .../io/qfileselector/tst_qfileselector.cpp | 12 +- .../qfilesystementry/tst_qfilesystementry.cpp | 14 +- .../tst_qfilesystemwatcher.cpp | 14 +- .../corelib/io/qiodevice/tst_qiodevice.cpp | 14 +- .../corelib/io/qipaddress/tst_qipaddress.cpp | 12 +- .../qlockfile_test_helper.cpp | 12 +- .../corelib/io/qlockfile/tst_qlockfile.cpp | 12 +- .../qloggingcategory/tst_qloggingcategory.cpp | 14 +- .../qloggingregistry/tst_qloggingregistry.cpp | 14 +- .../auto/corelib/io/qnodebug/tst_qnodebug.cpp | 14 +- .../tst_qprocessnoapplication.cpp | 12 +- .../io/qprocess/fileWriterProcess/main.cpp | 14 +- .../corelib/io/qprocess/testDetached/main.cpp | 14 +- .../io/qprocess/testExitCodes/main.cpp | 14 +- .../io/qprocess/testForwarding/main.cpp | 14 +- .../io/qprocess/testGuiProcess/main.cpp | 14 +- .../io/qprocess/testProcessCrash/main.cpp | 14 +- .../testProcessDeadWhileReading/main.cpp | 14 +- .../io/qprocess/testProcessEOF/main.cpp | 14 +- .../io/qprocess/testProcessEcho/main.cpp | 14 +- .../io/qprocess/testProcessEcho2/main.cpp | 14 +- .../io/qprocess/testProcessEcho3/main.cpp | 14 +- .../qprocess/testProcessEchoGui/main_win.cpp | 14 +- .../qprocess/testProcessEnvironment/main.cpp | 14 +- .../io/qprocess/testProcessNormal/main.cpp | 14 +- .../io/qprocess/testProcessOutput/main.cpp | 14 +- .../qprocess/testProcessSpacesArgs/main.cpp | 14 +- .../testSetNamedPipeHandleState/main.cpp | 14 +- .../qprocess/testSetWorkingDirectory/main.cpp | 14 +- .../io/qprocess/testSoftExit/main_unix.cpp | 14 +- .../io/qprocess/testSoftExit/main_win.cpp | 14 +- .../io/qprocess/testSpaceInName/main.cpp | 14 +- .../auto/corelib/io/qprocess/tst_qprocess.cpp | 14 +- .../tst_qprocessenvironment.cpp | 14 +- .../qresourceengine/tst_qresourceengine.cpp | 14 +- .../corelib/io/qsavefile/tst_qsavefile.cpp | 12 +- .../corelib/io/qsettings/tst_qsettings.cpp | 14 +- .../io/qstandardpaths/tst_qstandardpaths.cpp | 14 +- .../io/qstorageinfo/tst_qstorageinfo.cpp | 12 +- .../io/qtemporarydir/tst_qtemporarydir.cpp | 14 +- .../io/qtemporaryfile/tst_qtemporaryfile.cpp | 14 +- .../qtextstream/readAllStdinProcess/main.cpp | 14 +- .../qtextstream/readLineStdinProcess/main.cpp | 14 +- .../io/qtextstream/stdinProcess/main.cpp | 14 +- .../io/qtextstream/tst_qtextstream.cpp | 14 +- tests/auto/corelib/io/qurl/idna-test.c | 14 +- tests/auto/corelib/io/qurl/tst_qurl.cpp | 14 +- tests/auto/corelib/io/qurl/tst_qurl_mac.mm | 38 ++- .../io/qurlinternal/tst_qurlinternal.cpp | 14 +- .../corelib/io/qurlquery/tst_qurlquery.cpp | 12 +- .../tst_qwinoverlappedionotifier.cpp | 14 +- .../tst_qabstractitemmodel.cpp | 14 +- .../tst_qabstractproxymodel.cpp | 14 +- .../tst_qidentityproxymodel.cpp | 12 +- .../itemmodels/qitemmodel/modelstotest.cpp | 14 +- .../itemmodels/qitemmodel/tst_qitemmodel.cpp | 14 +- .../tst_qitemselectionmodel.cpp | 14 +- .../tst_qsortfilterproxymodel.cpp | 14 +- .../qstringlistmodel/qmodellistener.h | 14 +- .../qstringlistmodel/tst_qstringlistmodel.cpp | 14 +- tests/auto/corelib/json/tst_qtjson.cpp | 14 +- .../qcoreapplication/tst_qcoreapplication.cpp | 14 +- .../qcoreapplication/tst_qcoreapplication.h | 14 +- .../qeventdispatcher/tst_qeventdispatcher.cpp | 14 +- .../kernel/qeventloop/tst_qeventloop.cpp | 14 +- tests/auto/corelib/kernel/qmath/tst_qmath.cpp | 14 +- .../kernel/qmetaenum/tst_qmetaenum.cpp | 36 ++- .../kernel/qmetamethod/tst_qmetamethod.cpp | 14 +- .../kernel/qmetaobject/tst_qmetaobject.cpp | 14 +- .../tst_qmetaobjectbuilder.cpp | 14 +- .../qmetaproperty/tst_qmetaproperty.cpp | 14 +- .../kernel/qmetatype/tst_qmetatype.cpp | 14 +- .../kernel/qmimedata/tst_qmimedata.cpp | 14 +- .../kernel/qobject/signalbug/signalbug.cpp | 14 +- .../kernel/qobject/signalbug/signalbug.h | 14 +- .../corelib/kernel/qobject/tst_qobject.cpp | 14 +- .../corelib/kernel/qpointer/tst_qpointer.cpp | 14 +- .../qsharedmemory/sharedmemoryhelper/main.cpp | 14 +- .../qsharedmemory/test/tst_qsharedmemory.cpp | 14 +- .../qsignalblocker/tst_qsignalblocker.cpp | 12 +- .../qsignalmapper/tst_qsignalmapper.cpp | 14 +- .../qsocketnotifier/tst_qsocketnotifier.cpp | 14 +- .../systemsemaphorehelper/main.cpp | 14 +- .../test/tst_qsystemsemaphore.cpp | 14 +- .../auto/corelib/kernel/qtimer/tst_qtimer.cpp | 14 +- .../kernel/qtranslator/tst_qtranslator.cpp | 14 +- .../corelib/kernel/qvariant/tst_qvariant.cpp | 14 +- .../tst_qwineventnotifier.cpp | 14 +- .../tst_qmimedatabase-cache.cpp | 14 +- .../tst_qmimedatabase-xml.cpp | 14 +- .../corelib/mimetypes/qmimedatabase/test.qml | 12 +- .../qmimedatabase/tst_qmimedatabase.cpp | 14 +- .../qmimedatabase/tst_qmimedatabase.h | 14 +- .../mimetypes/qmimetype/tst_qmimetype.cpp | 14 +- .../plugin/qfactoryloader/plugin1/plugin1.cpp | 14 +- .../plugin/qfactoryloader/plugin1/plugin1.h | 14 +- .../qfactoryloader/plugin1/plugininterface1.h | 14 +- .../plugin/qfactoryloader/plugin2/plugin2.cpp | 14 +- .../plugin/qfactoryloader/plugin2/plugin2.h | 14 +- .../qfactoryloader/plugin2/plugininterface2.h | 14 +- .../qfactoryloader/tst_qfactoryloader.cpp | 14 +- .../auto/corelib/plugin/qlibrary/lib/mylib.c | 14 +- .../auto/corelib/plugin/qlibrary/lib2/mylib.c | 14 +- .../corelib/plugin/qlibrary/tst_qlibrary.cpp | 14 +- .../plugin/qplugin/debugplugin/main.cpp | 14 +- .../plugin/qplugin/releaseplugin/main.cpp | 14 +- .../corelib/plugin/qplugin/tst_qplugin.cpp | 14 +- .../almostplugin/almostplugin.cpp | 14 +- .../qpluginloader/almostplugin/almostplugin.h | 14 +- .../plugin/qpluginloader/fakeplugin.cpp | 12 +- .../corelib/plugin/qpluginloader/lib/mylib.c | 14 +- .../qpluginloader/machtest/generate-bad.pl | 12 +- .../qpluginloader/machtest/ppcconverter.pl | 12 +- .../qpluginloader/theplugin/plugininterface.h | 14 +- .../qpluginloader/theplugin/theplugin.cpp | 14 +- .../qpluginloader/theplugin/theplugin.h | 14 +- .../qpluginloader/tst_qpluginloader.cpp | 14 +- .../quuid/testProcessUniqueness/main.cpp | 14 +- tests/auto/corelib/plugin/quuid/tst_quuid.cpp | 14 +- .../statemachine/qstate/tst_qstate.cpp | 14 +- .../qstatemachine/tst_qstatemachine.cpp | 14 +- .../thread/qatomicint/tst_qatomicint.cpp | 14 +- .../qatomicinteger/tst_qatomicinteger.cpp | 12 +- .../qatomicpointer/tst_qatomicpointer.cpp | 14 +- .../corelib/thread/qfuture/tst_qfuture.cpp | 14 +- .../tst_qfuturesynchronizer.cpp | 14 +- .../qfuturewatcher/tst_qfuturewatcher.cpp | 14 +- .../auto/corelib/thread/qmutex/tst_qmutex.cpp | 14 +- .../thread/qmutexlocker/tst_qmutexlocker.cpp | 14 +- .../thread/qreadlocker/tst_qreadlocker.cpp | 14 +- .../qreadwritelock/tst_qreadwritelock.cpp | 14 +- .../thread/qresultstore/tst_qresultstore.cpp | 14 +- .../thread/qsemaphore/tst_qsemaphore.cpp | 14 +- .../corelib/thread/qthread/tst_qthread.cpp | 14 +- .../thread/qthreadonce/qthreadonce.cpp | 14 +- .../corelib/thread/qthreadonce/qthreadonce.h | 14 +- .../thread/qthreadonce/tst_qthreadonce.cpp | 14 +- .../thread/qthreadpool/tst_qthreadpool.cpp | 14 +- .../crashonexit/crashOnExit.cpp | 14 +- .../qthreadstorage/tst_qthreadstorage.cpp | 14 +- .../qwaitcondition/tst_qwaitcondition.cpp | 14 +- .../thread/qwritelocker/tst_qwritelocker.cpp | 14 +- .../tools/collections/tst_collections.cpp | 14 +- .../tools/qalgorithms/tst_qalgorithms.cpp | 14 +- .../corelib/tools/qarraydata/simplevector.h | 14 +- .../tools/qarraydata/tst_qarraydata.cpp | 14 +- .../corelib/tools/qbitarray/tst_qbitarray.cpp | 14 +- .../tools/qbytearray/tst_qbytearray.cpp | 14 +- .../tools/qbytearray/tst_qbytearray_mac.mm | 36 ++- .../qbytearraylist/tst_qbytearraylist.cpp | 14 +- .../tst_qbytearraymatcher.cpp | 14 +- .../qbytedatabuffer/tst_qbytedatabuffer.cpp | 12 +- .../auto/corelib/tools/qcache/tst_qcache.cpp | 14 +- tests/auto/corelib/tools/qchar/tst_qchar.cpp | 14 +- .../corelib/tools/qcollator/tst_qcollator.cpp | 14 +- .../qcommandlineparser_test_helper.cpp | 12 +- .../tst_qcommandlineparser.cpp | 12 +- .../qcontiguouscache/tst_qcontiguouscache.cpp | 14 +- .../tst_qcryptographichash.cpp | 14 +- tests/auto/corelib/tools/qdate/tst_qdate.cpp | 14 +- .../corelib/tools/qdatetime/tst_qdatetime.cpp | 14 +- .../tools/qdatetime/tst_qdatetime_mac.mm | 36 ++- .../tools/qeasingcurve/tst_qeasingcurve.cpp | 14 +- .../tools/qelapsedtimer/tst_qelapsedtimer.cpp | 14 +- .../tst_qexplicitlyshareddatapointer.cpp | 14 +- .../corelib/tools/qfreelist/tst_qfreelist.cpp | 14 +- tests/auto/corelib/tools/qhash/tst_qhash.cpp | 14 +- .../qhashfunctions/tst_qhashfunctions.cpp | 36 ++- tests/auto/corelib/tools/qline/tst_qline.cpp | 14 +- .../tools/qlinkedlist/tst_qlinkedlist.cpp | 14 +- tests/auto/corelib/tools/qlist/tst_qlist.cpp | 14 +- .../qlocale/syslocaleapp/syslocaleapp.cpp | 14 +- .../corelib/tools/qlocale/tst_qlocale.cpp | 14 +- tests/auto/corelib/tools/qmap/tst_qmap.cpp | 14 +- .../corelib/tools/qmargins/tst_qmargins.cpp | 14 +- .../tst_qmessageauthenticationcode.cpp | 12 +- tests/auto/corelib/tools/qpair/tst_qpair.cpp | 12 +- .../auto/corelib/tools/qpoint/tst_qpoint.cpp | 14 +- .../corelib/tools/qpointf/tst_qpointf.cpp | 14 +- .../auto/corelib/tools/qqueue/tst_qqueue.cpp | 14 +- tests/auto/corelib/tools/qrect/tst_qrect.cpp | 14 +- .../corelib/tools/qregexp/tst_qregexp.cpp | 14 +- .../tst_qregularexpression_alwaysoptimize.cpp | 12 +- ...tst_qregularexpression_defaultoptimize.cpp | 12 +- .../tst_qregularexpression_forceoptimize.cpp | 12 +- .../tst_qregularexpression.cpp | 12 +- .../tst_qregularexpression.h | 12 +- .../tools/qringbuffer/tst_qringbuffer.cpp | 14 +- .../qscopedpointer/tst_qscopedpointer.cpp | 14 +- .../tst_qscopedvaluerollback.cpp | 14 +- tests/auto/corelib/tools/qset/tst_qset.cpp | 14 +- .../tools/qsharedpointer/externaltests.cpp | 14 +- .../tools/qsharedpointer/externaltests.h | 14 +- .../tools/qsharedpointer/forwarddeclared.cpp | 14 +- .../tools/qsharedpointer/forwarddeclared.h | 14 +- .../tools/qsharedpointer/nontracked.cpp | 12 +- .../corelib/tools/qsharedpointer/nontracked.h | 12 +- .../qsharedpointer/tst_qsharedpointer.cpp | 14 +- .../corelib/tools/qsharedpointer/wrapper.cpp | 14 +- .../corelib/tools/qsharedpointer/wrapper.h | 14 +- tests/auto/corelib/tools/qsize/tst_qsize.cpp | 14 +- .../auto/corelib/tools/qsizef/tst_qsizef.cpp | 14 +- tests/auto/corelib/tools/qstl/tst_qstl.cpp | 14 +- .../auto/corelib/tools/qstring/double_data.h | 14 +- .../corelib/tools/qstring/tst_qstring.cpp | 14 +- .../corelib/tools/qstring/tst_qstring_mac.mm | 36 ++- .../tst_qstring_no_cast_from_bytearray.cpp | 14 +- .../qstringbuilder1/stringbuilder.cpp | 14 +- .../qstringbuilder1/tst_qstringbuilder1.cpp | 14 +- .../qstringbuilder2/tst_qstringbuilder2.cpp | 14 +- .../qstringbuilder3/tst_qstringbuilder3.cpp | 14 +- .../qstringbuilder4/tst_qstringbuilder4.cpp | 14 +- .../qstringiterator/tst_qstringiterator.cpp | 12 +- .../tools/qstringlist/tst_qstringlist.cpp | 14 +- .../qstringmatcher/tst_qstringmatcher.cpp | 14 +- .../tools/qstringref/tst_qstringref.cpp | 14 +- .../tst_qtextboundaryfinder.cpp | 14 +- tests/auto/corelib/tools/qtime/tst_qtime.cpp | 14 +- .../corelib/tools/qtimeline/tst_qtimeline.cpp | 14 +- .../corelib/tools/qtimezone/tst_qtimezone.cpp | 14 +- .../qvarlengtharray/tst_qvarlengtharray.cpp | 14 +- .../corelib/tools/qvector/tst_qvector.cpp | 14 +- .../qversionnumber/tst_qversionnumber.cpp | 14 +- tests/auto/corelib/xml/qxmlstream/qc14n.h | 14 +- .../auto/corelib/xml/qxmlstream/setupSuite.sh | 14 +- .../corelib/xml/qxmlstream/tst_qxmlstream.cpp | 14 +- .../auto/dbus/qdbusabstractadaptor/myobject.h | 14 +- .../qmyserver/qmyserver.cpp | 14 +- .../tst_qdbusabstractadaptor.cpp | 14 +- .../dbus/qdbusabstractinterface/interface.cpp | 14 +- .../dbus/qdbusabstractinterface/interface.h | 14 +- .../qpinger/qpinger.cpp | 14 +- .../tst_qdbusabstractinterface.cpp | 14 +- .../qdbusconnection/tst_qdbusconnection.cpp | 14 +- .../tst_qdbusconnection_no_bus.cpp | 14 +- .../dbus/qdbuscontext/tst_qdbuscontext.cpp | 14 +- tests/auto/dbus/qdbusinterface/myobject.h | 14 +- .../qdbusinterface/qmyserver/qmyserver.cpp | 14 +- .../qdbusinterface/tst_qdbusinterface.cpp | 14 +- .../qdbuslocalcalls/tst_qdbuslocalcalls.cpp | 14 +- tests/auto/dbus/qdbusmarshall/common.h | 14 +- tests/auto/dbus/qdbusmarshall/qpong/qpong.cpp | 14 +- .../dbus/qdbusmarshall/tst_qdbusmarshall.cpp | 14 +- .../qdbusmetaobject/tst_qdbusmetaobject.cpp | 14 +- .../dbus/qdbusmetatype/tst_qdbusmetatype.cpp | 14 +- .../qdbuspendingcall/tst_qdbuspendingcall.cpp | 14 +- .../tst_qdbuspendingreply.cpp | 14 +- tests/auto/dbus/qdbusreply/tst_qdbusreply.cpp | 14 +- .../tst_qdbusservicewatcher.cpp | 14 +- .../qdbusthreading/tst_qdbusthreading.cpp | 14 +- tests/auto/dbus/qdbustype/tst_qdbustype.cpp | 14 +- .../qdbusxmlparser/tst_qdbusxmlparser.cpp | 14 +- .../qicoimageformat/tst_qicoimageformat.cpp | 14 +- tests/auto/gui/image/qicon/tst_qicon.cpp | 14 +- tests/auto/gui/image/qimage/tst_qimage.cpp | 14 +- .../qimageiohandler/tst_qimageiohandler.cpp | 14 +- .../image/qimagereader/tst_qimagereader.cpp | 14 +- .../image/qimagewriter/tst_qimagewriter.cpp | 14 +- tests/auto/gui/image/qmovie/tst_qmovie.cpp | 14 +- .../auto/gui/image/qpicture/tst_qpicture.cpp | 14 +- tests/auto/gui/image/qpixmap/tst_qpixmap.cpp | 14 +- .../image/qpixmapcache/tst_qpixmapcache.cpp | 14 +- .../qstandarditem/tst_qstandarditem.cpp | 14 +- .../tst_qstandarditemmodel.cpp | 14 +- .../qbackingstore/tst_qbackingstore.cpp | 14 +- .../gui/kernel/qclipboard/copier/main.cpp | 14 +- .../gui/kernel/qclipboard/paster/main.cpp | 14 +- .../gui/kernel/qclipboard/tst_qclipboard.cpp | 14 +- tests/auto/gui/kernel/qdrag/tst_qdrag.cpp | 14 +- tests/auto/gui/kernel/qevent/tst_qevent.cpp | 14 +- .../qfileopeneventexternal.cpp | 14 +- .../test/tst_qfileopenevent.cpp | 14 +- .../qguiapplication/tst_qguiapplication.cpp | 14 +- .../kernel/qguimetatype/tst_qguimetatype.cpp | 14 +- .../qguivariant/no_application/main.cpp | 14 +- .../qguivariant/test/tst_qguivariant.cpp | 14 +- .../kernel/qinputmethod/tst_qinputmethod.cpp | 14 +- .../kernel/qkeysequence/tst_qkeysequence.cpp | 14 +- .../kernel/qmouseevent/tst_qmouseevent.cpp | 14 +- .../tst_qmouseevent_modal.cpp | 14 +- .../qopenglwindow/tst_qopenglwindow.cpp | 14 +- .../auto/gui/kernel/qpalette/tst_qpalette.cpp | 14 +- .../kernel/qpixelformat/tst_qpixelformat.cpp | 14 +- .../qrasterwindow/tst_qrasterwindow.cpp | 14 +- tests/auto/gui/kernel/qscreen/tst_qscreen.cpp | 14 +- .../qsurfaceformat/tst_qsurfaceformat.cpp | 14 +- .../kernel/qtouchevent/tst_qtouchevent.cpp | 14 +- tests/auto/gui/kernel/qwindow/tst_qwindow.cpp | 14 +- .../gui/math3d/qmatrixnxn/tst_qmatrixnxn.cpp | 14 +- .../math3d/qquaternion/tst_qquaternion.cpp | 14 +- .../gui/math3d/qvectornd/tst_qvectornd.cpp | 14 +- tests/auto/gui/painting/qbrush/tst_qbrush.cpp | 14 +- tests/auto/gui/painting/qcolor/tst_qcolor.cpp | 14 +- .../painting/qpagelayout/tst_qpagelayout.cpp | 12 +- .../gui/painting/qpagesize/tst_qpagesize.cpp | 14 +- .../qpaintengine/tst_qpaintengine.cpp | 14 +- .../gui/painting/qpainter/tst_qpainter.cpp | 14 +- .../qpainter/utils/createImages/main.cpp | 14 +- .../qpainterpath/tst_qpainterpath.cpp | 14 +- .../tst_qpainterpathstroker.cpp | 14 +- .../gui/painting/qpathclipper/pathcompare.h | 14 +- .../auto/gui/painting/qpathclipper/paths.cpp | 14 +- tests/auto/gui/painting/qpathclipper/paths.h | 14 +- .../qpathclipper/tst_qpathclipper.cpp | 14 +- .../painting/qpdfwriter/tst_qpdfwriter.cpp | 14 +- tests/auto/gui/painting/qpen/tst_qpen.cpp | 14 +- .../gui/painting/qpolygon/tst_qpolygon.cpp | 14 +- .../auto/gui/painting/qregion/tst_qregion.cpp | 14 +- .../painting/qtransform/tst_qtransform.cpp | 14 +- .../gui/painting/qwmatrix/tst_qwmatrix.cpp | 14 +- tests/auto/gui/qopengl/tst_qopengl.cpp | 14 +- .../gui/qopenglconfig/tst_qopenglconfig.cpp | 14 +- .../tst_qabstracttextdocumentlayout.cpp | 14 +- .../gui/text/qcssparser/tst_qcssparser.cpp | 14 +- tests/auto/gui/text/qfont/tst_qfont.cpp | 14 +- .../gui/text/qfontcache/tst_qfontcache.cpp | 14 +- .../text/qfontdatabase/tst_qfontdatabase.cpp | 14 +- .../text/qfontmetrics/tst_qfontmetrics.cpp | 14 +- .../auto/gui/text/qglyphrun/tst_qglyphrun.cpp | 14 +- tests/auto/gui/text/qrawfont/tst_qrawfont.cpp | 14 +- .../gui/text/qstatictext/tst_qstatictext.cpp | 14 +- .../tst_qsyntaxhighlighter.cpp | 14 +- .../gui/text/qtextblock/tst_qtextblock.cpp | 14 +- .../gui/text/qtextcursor/tst_qtextcursor.cpp | 14 +- tests/auto/gui/text/qtextdocument/common.h | 14 +- .../text/qtextdocument/tst_qtextdocument.cpp | 14 +- .../tst_qtextdocumentfragment.cpp | 14 +- .../tst_qtextdocumentlayout.cpp | 14 +- .../gui/text/qtextformat/tst_qtextformat.cpp | 14 +- .../gui/text/qtextlayout/tst_qtextlayout.cpp | 14 +- .../auto/gui/text/qtextlist/tst_qtextlist.cpp | 14 +- .../gui/text/qtextobject/tst_qtextobject.cpp | 14 +- .../qtextodfwriter/tst_qtextodfwriter.cpp | 14 +- .../qtextpiecetable/tst_qtextpiecetable.cpp | 14 +- .../text/qtextscriptengine/generate/main.cpp | 14 +- .../tst_qtextscriptengine.cpp | 14 +- .../gui/text/qtexttable/tst_qtexttable.cpp | 14 +- tests/auto/gui/text/qzip/tst_qzip.cpp | 14 +- .../qdesktopservices/tst_qdesktopservices.cpp | 14 +- .../qdoublevalidator/tst_qdoublevalidator.cpp | 14 +- .../util/qintvalidator/tst_qintvalidator.cpp | 14 +- .../qregexpvalidator/tst_qregexpvalidator.cpp | 14 +- .../tst_qregularexpressionvalidator.cpp | 14 +- tests/auto/network-settings.h | 14 +- .../tst_qabstractnetworkcache.cpp | 14 +- tests/auto/network/access/qftp/tst_qftp.cpp | 14 +- .../tst_qhttpnetworkconnection.cpp | 14 +- .../tst_qhttpnetworkreply.cpp | 14 +- .../tst_qnetworkaccessmanager.cpp | 14 +- .../tst_qnetworkcachemetadata.cpp | 14 +- .../qnetworkcookie/tst_qnetworkcookie.cpp | 14 +- .../tst_qnetworkcookiejar.cpp | 14 +- .../tst_qnetworkdiskcache.cpp | 14 +- .../access/qnetworkreply/echo/main.cpp | 14 +- .../qnetworkreply/tst_qnetworkreply.cpp | 14 +- .../qnetworkrequest/tst_qnetworkrequest.cpp | 14 +- tests/auto/network/access/spdy/tst_spdy.cpp | 12 +- tests/auto/network/bearer/qbearertestcommon.h | 14 +- .../tst_qnetworkconfiguration.cpp | 14 +- .../tst_qnetworkconfigurationmanager.cpp | 14 +- ...t_qnetworkconfigurationmanagerqappless.cpp | 14 +- .../bearer/qnetworksession/lackey/main.cpp | 14 +- .../test/tst_qnetworksession.cpp | 14 +- .../qauthenticator/tst_qauthenticator.cpp | 14 +- .../kernel/qdnslookup/tst_qdnslookup.cpp | 12 +- .../tst_qdnslookup_appless.cpp | 12 +- .../kernel/qhostaddress/tst_qhostaddress.cpp | 14 +- .../kernel/qhostinfo/tst_qhostinfo.cpp | 14 +- .../tst_qnetworkaddressentry.cpp | 14 +- .../tst_qnetworkinterface.cpp | 14 +- .../qnetworkproxy/tst_qnetworkproxy.cpp | 14 +- .../tst_qnetworkproxyfactory.cpp | 14 +- .../tst_platformsocketengine.cpp | 14 +- .../qabstractsocket/tst_qabstractsocket.cpp | 14 +- .../tst_qhttpsocketengine.cpp | 14 +- .../qlocalsocket/socketprocess/main.cpp | 14 +- .../socket/qlocalsocket/tst_qlocalsocket.cpp | 14 +- .../tst_qsocks5socketengine.cpp | 14 +- .../socket/qtcpserver/crashingServer/main.cpp | 14 +- .../socket/qtcpserver/tst_qtcpserver.cpp | 14 +- .../socket/qtcpsocket/stressTest/Test.cpp | 14 +- .../socket/qtcpsocket/stressTest/Test.h | 14 +- .../socket/qtcpsocket/stressTest/main.cpp | 14 +- .../socket/qtcpsocket/tst_qtcpsocket.cpp | 14 +- .../socket/qudpsocket/clientserver/main.cpp | 14 +- .../socket/qudpsocket/tst_qudpsocket.cpp | 14 +- .../socket/qudpsocket/udpServer/main.cpp | 14 +- .../ssl/qasn1element/tst_qasn1element.cpp | 12 +- .../certificates/gencertificates.sh | 14 +- .../qsslcertificate/tst_qsslcertificate.cpp | 14 +- .../network/ssl/qsslcipher/tst_qsslcipher.cpp | 14 +- .../tst_qsslellipticcurve.cpp | 34 ++- .../network/ssl/qsslerror/tst_qsslerror.cpp | 14 +- .../auto/network/ssl/qsslkey/keys/genkeys.sh | 14 +- .../auto/network/ssl/qsslkey/tst_qsslkey.cpp | 14 +- .../network/ssl/qsslsocket/tst_qsslsocket.cpp | 14 +- ...qsslsocket_onDemandCertificates_member.cpp | 14 +- ...qsslsocket_onDemandCertificates_static.cpp | 14 +- tests/auto/opengl/qgl/tst_qgl.cpp | 14 +- tests/auto/opengl/qglbuffer/tst_qglbuffer.cpp | 14 +- .../opengl/qglfunctions/tst_qglfunctions.cpp | 14 +- .../auto/opengl/qglthreads/tst_qglthreads.cpp | 14 +- tests/auto/opengl/qglthreads/tst_qglthreads.h | 14 +- tests/auto/other/android/tst_android.cpp | 14 +- tests/auto/other/atwrapper/atWrapper.cpp | 14 +- tests/auto/other/atwrapper/atWrapper.h | 14 +- .../other/atwrapper/atWrapperAutotest.cpp | 14 +- .../baselineexample/tst_baselineexample.cpp | 14 +- tests/auto/other/compiler/baseclass.cpp | 14 +- tests/auto/other/compiler/baseclass.h | 14 +- tests/auto/other/compiler/derivedclass.cpp | 14 +- tests/auto/other/compiler/derivedclass.h | 14 +- tests/auto/other/compiler/othersource.cpp | 12 +- tests/auto/other/compiler/tst_compiler.cpp | 14 +- tests/auto/other/gestures/tst_gestures.cpp | 14 +- tests/auto/other/lancelot/paintcommands.cpp | 14 +- tests/auto/other/lancelot/paintcommands.h | 14 +- tests/auto/other/lancelot/tst_lancelot.cpp | 14 +- .../languagechange/tst_languagechange.cpp | 14 +- tests/auto/other/macgui/guitest.cpp | 14 +- tests/auto/other/macgui/guitest.h | 14 +- tests/auto/other/macgui/tst_macgui.cpp | 14 +- .../macnativeevents/expectedeventlist.cpp | 14 +- .../other/macnativeevents/expectedeventlist.h | 14 +- .../other/macnativeevents/nativeeventlist.cpp | 14 +- .../other/macnativeevents/nativeeventlist.h | 14 +- .../other/macnativeevents/qnativeevents.cpp | 14 +- .../other/macnativeevents/qnativeevents.h | 14 +- .../macnativeevents/qnativeevents_mac.cpp | 14 +- .../macnativeevents/tst_macnativeevents.cpp | 14 +- tests/auto/other/macplist/app/main.cpp | 14 +- tests/auto/other/macplist/tst_macplist.cpp | 14 +- .../auto/other/modeltest/dynamictreemodel.cpp | 12 +- tests/auto/other/modeltest/dynamictreemodel.h | 12 +- tests/auto/other/modeltest/modeltest.cpp | 14 +- tests/auto/other/modeltest/modeltest.h | 14 +- tests/auto/other/modeltest/tst_modeltest.cpp | 14 +- .../networkselftest/tst_networkselftest.cpp | 14 +- .../other/qaccessibility/accessiblewidgets.h | 14 +- .../qaccessibility/tst_qaccessibility.cpp | 14 +- .../tst_qaccessibilitylinux.cpp | 14 +- .../tst_qaccessibilitymac.cpp | 14 +- .../tst_qaccessibilitymac_helpers.h | 14 +- .../tst_qaccessibilitymac_helpers.mm | 36 ++- .../other/qcomplextext/bidireorderstring.h | 14 +- .../other/qcomplextext/tst_qcomplextext.cpp | 14 +- .../other/qfocusevent/tst_qfocusevent.cpp | 14 +- ...tworkaccessmanager_and_qprogressdialog.cpp | 14 +- .../tst_qobjectperformance.cpp | 14 +- .../other/qobjectrace/tst_qobjectrace.cpp | 14 +- .../tst_qprocess_and_guieventloop.cpp | 12 +- .../write-read-write/main.cpp | 12 +- .../tst_qsharedpointer_and_qwidget.cpp | 14 +- .../qtokenautomaton/generateTokenizers.sh | 14 +- .../tokenizers/basic/basic.cpp | 14 +- .../qtokenautomaton/tokenizers/basic/basic.h | 14 +- .../basicNamespace/basicNamespace.cpp | 14 +- .../basicNamespace/basicNamespace.h | 14 +- .../tokenizers/boilerplate/boilerplate.cpp | 14 +- .../tokenizers/boilerplate/boilerplate.h | 14 +- .../tokenizers/boilerplate/boilerplate.xml | 38 ++- .../tokenizers/noNamespace/noNamespace.cpp | 14 +- .../tokenizers/noNamespace/noNamespace.h | 14 +- .../tokenizers/noToString/noToString.cpp | 14 +- .../tokenizers/noToString/noToString.h | 14 +- .../withNamespace/withNamespace.cpp | 14 +- .../tokenizers/withNamespace/withNamespace.h | 14 +- .../qtokenautomaton/tst_qtokenautomaton.cpp | 14 +- .../qvariant_common/tst_qvariant_common.h | 14 +- .../other/toolsupport/tst_toolsupport.cpp | 16 +- .../other/windowsmobile/test/ddhelper.cpp | 14 +- .../auto/other/windowsmobile/test/ddhelper.h | 14 +- .../windowsmobile/test/tst_windowsmobile.cpp | 14 +- .../other/windowsmobile/testQMenuBar/main.cpp | 14 +- .../tst_qabstractprintdialog.cpp | 14 +- .../kernel/qprintdevice/tst_qprintdevice.cpp | 12 +- .../kernel/qprinter/tst_qprinter.cpp | 14 +- .../kernel/qprinterinfo/tst_qprinterinfo.cpp | 14 +- tests/auto/qtest-config.h | 14 +- tests/auto/shared/platformclipboard.h | 14 +- tests/auto/shared/platforminputcontext.h | 14 +- tests/auto/sql/kernel/qsql/tst_qsql.cpp | 14 +- .../sql/kernel/qsqldatabase/tst_databases.h | 14 +- .../kernel/qsqldatabase/tst_qsqldatabase.cpp | 14 +- .../sql/kernel/qsqldriver/tst_qsqldriver.cpp | 14 +- .../sql/kernel/qsqlerror/tst_qsqlerror.cpp | 14 +- .../sql/kernel/qsqlfield/tst_qsqlfield.cpp | 14 +- .../sql/kernel/qsqlquery/tst_qsqlquery.cpp | 14 +- .../sql/kernel/qsqlrecord/tst_qsqlrecord.cpp | 14 +- .../sql/kernel/qsqlresult/testsqldriver.h | 14 +- .../sql/kernel/qsqlresult/tst_qsqlresult.cpp | 14 +- .../sql/kernel/qsqlthread/tst_qsqlthread.cpp | 14 +- .../qsqlquerymodel/tst_qsqlquerymodel.cpp | 14 +- .../tst_qsqlrelationaltablemodel.cpp | 14 +- .../qsqltablemodel/tst_qsqltablemodel.cpp | 14 +- tests/auto/test.pl | 14 +- .../testlib/qsignalspy/tst_qsignalspy.cpp | 14 +- .../testlib/selftests/alive/qtestalive.cpp | 14 +- .../testlib/selftests/alive/tst_alive.cpp | 14 +- .../testlib/selftests/assert/tst_assert.cpp | 14 +- .../testlib/selftests/badxml/tst_badxml.cpp | 14 +- .../tst_benchlibcallgrind.cpp | 14 +- .../benchlibcounting/tst_benchlibcounting.cpp | 14 +- .../tst_benchlibeventcounter.cpp | 14 +- .../benchliboptions/tst_benchliboptions.cpp | 14 +- .../tst_benchlibtickcounter.cpp | 14 +- .../benchlibwalltime/tst_benchlibwalltime.cpp | 14 +- .../testlib/selftests/cmptest/tst_cmptest.cpp | 14 +- .../commandlinedata/tst_commandlinedata.cpp | 14 +- .../selftests/counting/tst_counting.cpp | 14 +- .../testlib/selftests/crashes/tst_crashes.cpp | 14 +- .../selftests/datatable/tst_datatable.cpp | 14 +- .../selftests/datetime/tst_datetime.cpp | 14 +- .../differentexec/tst_differentexec.cpp | 14 +- .../exceptionthrow/tst_exceptionthrow.cpp | 14 +- .../selftests/expectfail/tst_expectfail.cpp | 14 +- .../selftests/failcleanup/tst_failcleanup.cpp | 14 +- .../selftests/failinit/tst_failinit.cpp | 14 +- .../failinitdata/tst_failinitdata.cpp | 14 +- .../selftests/fetchbogus/tst_fetchbogus.cpp | 14 +- .../selftests/findtestdata/findtestdata.cpp | 14 +- .../testlib/selftests/float/tst_float.cpp | 14 +- .../selftests/generate_expected_output.py | 14 +- .../selftests/globaldata/tst_globaldata.cpp | 14 +- .../selftests/longstring/tst_longstring.cpp | 14 +- .../selftests/maxwarnings/maxwarnings.cpp | 14 +- .../selftests/multiexec/tst_multiexec.cpp | 14 +- .../printdatatags/tst_printdatatags.cpp | 14 +- .../tst_printdatatagswithglobaltags.cpp | 14 +- .../qexecstringlist/tst_qexecstringlist.cpp | 14 +- .../testlib/selftests/silent/tst_silent.cpp | 14 +- .../selftests/singleskip/tst_singleskip.cpp | 14 +- .../auto/testlib/selftests/skip/tst_skip.cpp | 14 +- .../selftests/skipcleanup/tst_skipcleanup.cpp | 14 +- .../selftests/skipinit/tst_skipinit.cpp | 14 +- .../skipinitdata/tst_skipinitdata.cpp | 14 +- .../testlib/selftests/sleep/tst_sleep.cpp | 14 +- .../testlib/selftests/strcmp/tst_strcmp.cpp | 14 +- .../testlib/selftests/subtest/tst_subtest.cpp | 14 +- .../auto/testlib/selftests/tst_selftests.cpp | 14 +- .../tst_verifyexceptionthrown.cpp | 14 +- .../selftests/warnings/tst_warnings.cpp | 14 +- .../testlib/selftests/xunit/tst_xunit.cpp | 14 +- .../Test.framework/Headers/testinterface.h | 14 +- tests/auto/tools/moc/assign-namespace.h | 14 +- tests/auto/tools/moc/backslash-newlines.h | 14 +- tests/auto/tools/moc/c-comments.h | 14 +- tests/auto/tools/moc/cstyle-enums.h | 14 +- tests/auto/tools/moc/cxx11-enums.h | 12 +- .../moc/cxx11-explicit-override-control.h | 12 +- tests/auto/tools/moc/cxx11-final-classes.h | 12 +- tests/auto/tools/moc/dir-in-include-path.h | 14 +- tests/auto/tools/moc/dollars.h | 12 +- tests/auto/tools/moc/error-on-wrong-notify.h | 14 +- .../tools/moc/escapes-in-string-literals.h | 14 +- tests/auto/tools/moc/extraqualification.h | 14 +- tests/auto/tools/moc/forgotten-qinterface.h | 14 +- tests/auto/tools/moc/forward-declared-param.h | 12 +- .../auto/tools/moc/function-with-attributes.h | 14 +- tests/auto/tools/moc/gadgetwithnoenums.h | 14 +- .../tools/moc/grand-parent-gadget-class.h | 14 +- .../auto/tools/moc/interface-from-framework.h | 14 +- tests/auto/tools/moc/interface-from-include.h | 14 +- tests/auto/tools/moc/macro-on-cmdline.h | 14 +- tests/auto/tools/moc/namespaced-flags.h | 14 +- tests/auto/tools/moc/no-keywords.h | 14 +- .../auto/tools/moc/non-gadget-parent-class.h | 14 +- tests/auto/tools/moc/oldstyle-casts.h | 14 +- tests/auto/tools/moc/os9-newlines.h | 2 +- tests/auto/tools/moc/parse-boost.h | 14 +- tests/auto/tools/moc/parse-defines.h | 14 +- tests/auto/tools/moc/plugin_metadata.h | 14 +- tests/auto/tools/moc/pp-dollar-signs.h | 14 +- tests/auto/tools/moc/pure-virtual-signals.h | 14 +- tests/auto/tools/moc/qinvokable.h | 14 +- tests/auto/tools/moc/qprivateslots.h | 14 +- tests/auto/tools/moc/qtbug-35657-gadget.h | 14 +- .../tools/moc/related-metaobjects-in-gadget.h | 14 +- .../moc/related-metaobjects-in-namespaces.h | 14 +- .../moc/related-metaobjects-name-conflict.h | 14 +- .../moc/single-quote-digit-separator-n3781.h | 12 +- .../auto/tools/moc/single_function_keyword.h | 14 +- .../auto/tools/moc/slots-with-void-template.h | 14 +- tests/auto/tools/moc/task189996.h | 14 +- tests/auto/tools/moc/task192552.h | 14 +- tests/auto/tools/moc/task234909.h | 14 +- tests/auto/tools/moc/task240368.h | 14 +- tests/auto/tools/moc/task87883.h | 14 +- tests/auto/tools/moc/template-gtgt.h | 14 +- .../tools/moc/testproject/Plugin/Plugin.h | 14 +- tests/auto/tools/moc/trigraphs.h | 14 +- tests/auto/tools/moc/tst_moc.cpp | 14 +- .../tools/moc/unterminated-function-macro.h | 14 +- tests/auto/tools/moc/using-namespaces.h | 14 +- .../moc/warn-on-multiple-qobject-subclasses.h | 14 +- .../tools/moc/warn-on-property-without-read.h | 14 +- tests/auto/tools/moc/win-newlines.h | 14 +- tests/auto/tools/qdbuscpp2xml/test1.h | 12 +- .../tools/qdbuscpp2xml/tst_qdbuscpp2xml.cpp | 12 +- .../tools/qdbusxml2cpp/tst_qdbusxml2cpp.cpp | 12 +- tests/auto/tools/qmake/testcompiler.cpp | 14 +- tests/auto/tools/qmake/testcompiler.h | 14 +- .../tools/qmake/testdata/findDeps/main.cpp | 14 +- .../tools/qmake/testdata/findDeps/object1.h | 14 +- .../tools/qmake/testdata/findDeps/object2.h | 14 +- .../tools/qmake/testdata/findDeps/object3.h | 14 +- .../tools/qmake/testdata/findDeps/object4.h | 14 +- .../tools/qmake/testdata/findDeps/object5.h | 14 +- .../tools/qmake/testdata/findDeps/object6.h | 14 +- .../tools/qmake/testdata/findDeps/object7.h | 14 +- .../tools/qmake/testdata/findDeps/object8.h | 14 +- .../tools/qmake/testdata/findDeps/object9.h | 14 +- .../tools/qmake/testdata/findMocs/main.cpp | 14 +- .../tools/qmake/testdata/findMocs/object1.h | 14 +- .../tools/qmake/testdata/findMocs/object2.h | 14 +- .../tools/qmake/testdata/findMocs/object3.h | 14 +- .../tools/qmake/testdata/findMocs/object4.h | 14 +- .../tools/qmake/testdata/findMocs/object5.h | 14 +- .../tools/qmake/testdata/findMocs/object6.h | 14 +- .../tools/qmake/testdata/findMocs/object7.h | 14 +- .../auto/tools/qmake/testdata/functions/1.cpp | 14 +- .../auto/tools/qmake/testdata/functions/2.cpp | 14 +- .../tools/qmake/testdata/functions/one/1.cpp | 14 +- .../tools/qmake/testdata/functions/one/2.cpp | 14 +- .../testdata/functions/three/wildcard21.cpp | 14 +- .../testdata/functions/three/wildcard22.cpp | 14 +- .../tools/qmake/testdata/functions/two/1.cpp | 14 +- .../tools/qmake/testdata/functions/two/2.cpp | 14 +- .../qmake/testdata/functions/wildcard21.cpp | 14 +- .../qmake/testdata/functions/wildcard22.cpp | 14 +- .../tools/qmake/testdata/include_dir/main.cpp | 14 +- .../qmake/testdata/include_dir/test_file.cpp | 14 +- .../qmake/testdata/include_dir/test_file.h | 14 +- .../qmake/testdata/include_function/main.cpp | 14 +- .../qmake/testdata/install_depends/main.cpp | 14 +- .../testdata/install_depends/test_file.cpp | 14 +- .../testdata/install_depends/test_file.h | 14 +- .../tools/qmake/testdata/one_space/main.cpp | 14 +- .../tools/qmake/testdata/project/main.cpp | 14 +- .../qmake/testdata/project/test_file.cpp | 14 +- .../tools/qmake/testdata/project/test_file.h | 14 +- .../qmake/testdata/quotedfilenames/main.cpp | 14 +- .../qmake/testdata/shadow_files/main.cpp | 14 +- .../qmake/testdata/shadow_files/test_file.cpp | 14 +- .../qmake/testdata/shadow_files/test_file.h | 14 +- .../tools/qmake/testdata/simple_app/main.cpp | 14 +- .../qmake/testdata/simple_app/test_file.cpp | 14 +- .../qmake/testdata/simple_app/test_file.h | 14 +- .../qmake/testdata/simple_dll/simple.cpp | 14 +- .../tools/qmake/testdata/simple_dll/simple.h | 14 +- .../qmake/testdata/simple_lib/simple.cpp | 14 +- .../tools/qmake/testdata/simple_lib/simple.h | 14 +- .../simple/main.cpp | 14 +- .../testdata/subdirs/simple_app/main.cpp | 14 +- .../testdata/subdirs/simple_app/test_file.cpp | 14 +- .../testdata/subdirs/simple_app/test_file.h | 14 +- .../testdata/subdirs/simple_dll/simple.cpp | 14 +- .../testdata/subdirs/simple_dll/simple.h | 14 +- tests/auto/tools/qmake/tst_qmake.cpp | 14 +- tests/auto/tools/rcc/tst_rcc.cpp | 14 +- .../tools/uic/baseline/batchtranslation.ui | 14 +- .../tools/uic/baseline/batchtranslation.ui.h | 14 +- tests/auto/tools/uic/baseline/config.ui | 14 +- tests/auto/tools/uic/baseline/config.ui.h | 14 +- tests/auto/tools/uic/baseline/finddialog.ui | 14 +- tests/auto/tools/uic/baseline/finddialog.ui.h | 14 +- .../tools/uic/baseline/formwindowsettings.ui | 14 +- .../uic/baseline/formwindowsettings.ui.h | 14 +- tests/auto/tools/uic/baseline/helpdialog.ui | 14 +- tests/auto/tools/uic/baseline/helpdialog.ui.h | 14 +- .../tools/uic/baseline/listwidgeteditor.ui | 14 +- .../tools/uic/baseline/listwidgeteditor.ui.h | 14 +- .../tools/uic/baseline/newactiondialog.ui | 14 +- .../tools/uic/baseline/newactiondialog.ui.h | 14 +- tests/auto/tools/uic/baseline/newform.ui | 14 +- tests/auto/tools/uic/baseline/newform.ui.h | 14 +- tests/auto/tools/uic/baseline/orderdialog.ui | 14 +- .../auto/tools/uic/baseline/orderdialog.ui.h | 14 +- .../auto/tools/uic/baseline/paletteeditor.ui | 14 +- .../tools/uic/baseline/paletteeditor.ui.h | 14 +- .../auto/tools/uic/baseline/phrasebookbox.ui | 14 +- .../tools/uic/baseline/phrasebookbox.ui.h | 14 +- tests/auto/tools/uic/baseline/plugindialog.ui | 14 +- .../auto/tools/uic/baseline/plugindialog.ui.h | 14 +- .../auto/tools/uic/baseline/previewwidget.ui | 14 +- .../tools/uic/baseline/previewwidget.ui.h | 14 +- tests/auto/tools/uic/baseline/qfiledialog.ui | 14 +- .../auto/tools/uic/baseline/qfiledialog.ui.h | 14 +- .../tools/uic/baseline/qtgradientdialog.ui | 14 +- .../tools/uic/baseline/qtgradientdialog.ui.h | 14 +- .../tools/uic/baseline/qtgradienteditor.ui | 14 +- .../tools/uic/baseline/qtgradienteditor.ui.h | 14 +- .../uic/baseline/qtgradientviewdialog.ui | 14 +- .../uic/baseline/qtgradientviewdialog.ui.h | 14 +- .../tools/uic/baseline/saveformastemplate.ui | 14 +- .../uic/baseline/saveformastemplate.ui.h | 14 +- tests/auto/tools/uic/baseline/statistics.ui | 14 +- tests/auto/tools/uic/baseline/statistics.ui.h | 14 +- .../tools/uic/baseline/stringlisteditor.ui | 14 +- .../tools/uic/baseline/stringlisteditor.ui.h | 14 +- .../auto/tools/uic/baseline/tabbedbrowser.ui | 14 +- .../tools/uic/baseline/tabbedbrowser.ui.h | 14 +- .../tools/uic/baseline/tablewidgeteditor.ui | 14 +- .../tools/uic/baseline/tablewidgeteditor.ui.h | 14 +- .../tools/uic/baseline/translatedialog.ui | 14 +- .../tools/uic/baseline/translatedialog.ui.h | 14 +- .../tools/uic/baseline/treewidgeteditor.ui | 14 +- .../tools/uic/baseline/treewidgeteditor.ui.h | 14 +- .../auto/tools/uic/baseline/trpreviewtool.ui | 14 +- .../tools/uic/baseline/trpreviewtool.ui.h | 14 +- tests/auto/tools/uic/tst_uic.cpp | 14 +- .../dialogs/qcolordialog/tst_qcolordialog.cpp | 14 +- .../widgets/dialogs/qdialog/tst_qdialog.cpp | 14 +- .../qerrormessage/tst_qerrormessage.cpp | 14 +- .../dialogs/qfiledialog/tst_qfiledialog.cpp | 14 +- .../dialogs/qfiledialog2/tst_qfiledialog2.cpp | 14 +- .../qfilesystemmodel/tst_qfilesystemmodel.cpp | 14 +- .../dialogs/qfontdialog/tst_qfontdialog.cpp | 14 +- .../tst_qfontdialog_mac_helpers.mm | 38 ++- .../dialogs/qinputdialog/tst_qinputdialog.cpp | 14 +- .../dialogs/qmessagebox/tst_qmessagebox.cpp | 14 +- .../qprogressdialog/tst_qprogressdialog.cpp | 14 +- .../widgets/dialogs/qsidebar/tst_qsidebar.cpp | 14 +- .../widgets/dialogs/qwizard/tst_qwizard.cpp | 14 +- .../widgets/dialogs/qwizard/tst_qwizard_2.cpp | 14 +- .../qgraphicseffect/tst_qgraphicseffect.cpp | 14 +- .../qpixmapfilter/tst_qpixmapfilter.cpp | 14 +- .../tst_qgesturerecognizer.cpp | 14 +- .../tst_qgraphicsanchorlayout.cpp | 14 +- .../tst_qgraphicsanchorlayout1.cpp | 14 +- .../tst_qgraphicseffectsource.cpp | 14 +- .../tst_qgraphicsgridlayout.cpp | 14 +- .../qgraphicsitem/tst_qgraphicsitem.cpp | 14 +- .../tst_qgraphicsitemanimation.cpp | 14 +- .../qgraphicslayout/tst_qgraphicslayout.cpp | 14 +- .../tst_qgraphicslayoutitem.cpp | 14 +- .../tst_qgraphicslinearlayout.cpp | 14 +- .../qgraphicsobject/tst_qgraphicsobject.cpp | 14 +- .../tst_qgraphicspixmapitem.cpp | 14 +- .../tst_qgraphicspolygonitem.cpp | 14 +- .../tst_qgraphicsproxywidget.cpp | 14 +- .../qgraphicsscene/tst_qgraphicsscene.cpp | 14 +- .../tst_qgraphicssceneindex.cpp | 14 +- .../tst_qgraphicstransform.cpp | 14 +- .../qgraphicsview/tst_qgraphicsview.cpp | 14 +- .../qgraphicsview/tst_qgraphicsview.h | 14 +- .../qgraphicsview/tst_qgraphicsview_2.cpp | 14 +- .../qgraphicswidget/tst_qgraphicswidget.cpp | 14 +- .../tst_qabstractitemview.cpp | 14 +- .../itemviews/qcolumnview/tst_qcolumnview.cpp | 14 +- .../tst_qdatawidgetmapper.cpp | 14 +- .../itemviews/qdirmodel/tst_qdirmodel.cpp | 14 +- .../tst_qfileiconprovider.cpp | 14 +- .../itemviews/qheaderview/tst_qheaderview.cpp | 14 +- .../qitemdelegate/tst_qitemdelegate.cpp | 14 +- .../tst_qitemeditorfactory.cpp | 14 +- .../itemviews/qitemview/tst_qitemview.cpp | 14 +- .../itemviews/qitemview/viewstotest.cpp | 14 +- .../itemviews/qlistview/tst_qlistview.cpp | 14 +- .../itemviews/qlistwidget/tst_qlistwidget.cpp | 14 +- .../itemviews/qtableview/tst_qtableview.cpp | 14 +- .../qtablewidget/tst_qtablewidget.cpp | 14 +- .../itemviews/qtreeview/tst_qtreeview.cpp | 14 +- .../itemviews/qtreewidget/tst_qtreewidget.cpp | 14 +- .../tst_qtreewidgetitemiterator.cpp | 14 +- .../widgets/kernel/qaction/tst_qaction.cpp | 14 +- .../kernel/qactiongroup/tst_qactiongroup.cpp | 14 +- .../desktopsettingsaware/main.cpp | 14 +- .../kernel/qapplication/modal/base.cpp | 14 +- .../widgets/kernel/qapplication/modal/base.h | 14 +- .../kernel/qapplication/modal/main.cpp | 14 +- .../kernel/qapplication/tst_qapplication.cpp | 14 +- .../kernel/qapplication/wincmdline/main.cpp | 14 +- .../kernel/qboxlayout/tst_qboxlayout.cpp | 14 +- .../qdesktopwidget/tst_qdesktopwidget.cpp | 14 +- .../kernel/qformlayout/tst_qformlayout.cpp | 14 +- .../kernel/qgridlayout/tst_qgridlayout.cpp | 14 +- .../widgets/kernel/qlayout/tst_qlayout.cpp | 14 +- .../kernel/qshortcut/tst_qshortcut.cpp | 14 +- .../kernel/qsizepolicy/tst_qsizepolicy.cpp | 14 +- .../qstackedlayout/tst_qstackedlayout.cpp | 14 +- .../widgets/kernel/qtooltip/tst_qtooltip.cpp | 14 +- .../widgets/kernel/qwidget/tst_qwidget.cpp | 14 +- .../kernel/qwidget/tst_qwidget_mac_helpers.h | 14 +- .../kernel/qwidget/tst_qwidget_mac_helpers.mm | 38 ++- .../qwidget_window/tst_qwidget_window.cpp | 14 +- .../qwidgetaction/tst_qwidgetaction.cpp | 14 +- .../qwidgetmetatype/tst_qwidgetmetatype.cpp | 12 +- .../qwidgetsvariant/tst_qwidgetsvariant.cpp | 14 +- .../qwindowcontainer/tst_qwindowcontainer.cpp | 14 +- .../styles/qmacstyle/tst_qmacstyle.cpp | 14 +- .../auto/widgets/styles/qstyle/tst_qstyle.cpp | 14 +- .../styles/qstyleoption/tst_qstyleoption.cpp | 14 +- .../qstylesheetstyle/tst_qstylesheetstyle.cpp | 14 +- .../util/qcompleter/tst_qcompleter.cpp | 14 +- .../widgets/util/qscroller/tst_qscroller.cpp | 14 +- .../qsystemtrayicon/tst_qsystemtrayicon.cpp | 14 +- .../util/qundogroup/tst_qundogroup.cpp | 14 +- .../util/qundostack/tst_qundostack.cpp | 14 +- .../qabstractbutton/tst_qabstractbutton.cpp | 14 +- .../tst_qabstractscrollarea.cpp | 14 +- .../qabstractslider/tst_qabstractslider.cpp | 14 +- .../qabstractspinbox/tst_qabstractspinbox.cpp | 14 +- .../widgets/qbuttongroup/tst_qbuttongroup.cpp | 14 +- .../qcalendarwidget/tst_qcalendarwidget.cpp | 14 +- .../widgets/qcheckbox/tst_qcheckbox.cpp | 14 +- .../widgets/qcombobox/tst_qcombobox.cpp | 14 +- .../tst_qcommandlinkbutton.cpp | 14 +- .../qdatetimeedit/tst_qdatetimeedit.cpp | 14 +- .../auto/widgets/widgets/qdial/tst_qdial.cpp | 14 +- .../qdialogbuttonbox/tst_qdialogbuttonbox.cpp | 14 +- .../widgets/qdockwidget/tst_qdockwidget.cpp | 14 +- .../qdoublespinbox/tst_qdoublespinbox.cpp | 14 +- .../widgets/qfocusframe/tst_qfocusframe.cpp | 14 +- .../qfontcombobox/tst_qfontcombobox.cpp | 14 +- .../widgets/widgets/qframe/tst_qframe.cpp | 14 +- .../widgets/qgroupbox/tst_qgroupbox.cpp | 14 +- .../qkeysequenceedit/tst_qkeysequenceedit.cpp | 14 +- .../widgets/widgets/qlabel/tst_qlabel.cpp | 14 +- .../widgets/qlcdnumber/tst_qlcdnumber.cpp | 14 +- .../widgets/qlineedit/tst_qlineedit.cpp | 14 +- .../widgets/qmainwindow/tst_qmainwindow.cpp | 14 +- .../widgets/widgets/qmdiarea/tst_qmdiarea.cpp | 14 +- .../qmdisubwindow/tst_qmdisubwindow.cpp | 14 +- .../auto/widgets/widgets/qmenu/tst_qmenu.cpp | 14 +- .../widgets/widgets/qmenu/tst_qmenu_mac.mm | 38 ++- .../widgets/widgets/qmenubar/tst_qmenubar.cpp | 14 +- .../qopenglwidget/tst_qopenglwidget.cpp | 14 +- .../qplaintextedit/tst_qplaintextedit.cpp | 14 +- .../widgets/qprogressbar/tst_qprogressbar.cpp | 14 +- .../widgets/qpushbutton/tst_qpushbutton.cpp | 14 +- .../widgets/qradiobutton/tst_qradiobutton.cpp | 14 +- .../widgets/qscrollarea/tst_qscrollarea.cpp | 14 +- .../widgets/qscrollbar/tst_qscrollbar.cpp | 14 +- .../widgets/qsizegrip/tst_qsizegrip.cpp | 14 +- .../widgets/widgets/qslider/tst_qslider.cpp | 14 +- .../widgets/widgets/qspinbox/tst_qspinbox.cpp | 14 +- .../widgets/qsplitter/tst_qsplitter.cpp | 14 +- .../qstackedwidget/tst_qstackedwidget.cpp | 14 +- .../widgets/qstatusbar/tst_qstatusbar.cpp | 14 +- .../widgets/widgets/qtabbar/tst_qtabbar.cpp | 14 +- .../widgets/qtabwidget/tst_qtabwidget.cpp | 14 +- .../widgets/qtextbrowser/tst_qtextbrowser.cpp | 14 +- .../widgets/qtextedit/tst_qtextedit.cpp | 14 +- .../widgets/widgets/qtoolbar/tst_qtoolbar.cpp | 14 +- .../widgets/widgets/qtoolbox/tst_qtoolbox.cpp | 14 +- .../widgets/qtoolbutton/tst_qtoolbutton.cpp | 14 +- tests/auto/xml/dom/qdom/tst_qdom.cpp | 14 +- tests/auto/xml/sax/qxml/tst_qxml.cpp | 14 +- .../qxmlinputsource/tst_qxmlinputsource.cpp | 14 +- .../qxmlsimplereader/generate_ref_files.sh | 14 +- .../xml/sax/qxmlsimplereader/parser/main.cpp | 14 +- .../sax/qxmlsimplereader/parser/parser.cpp | 14 +- .../xml/sax/qxmlsimplereader/parser/parser.h | 14 +- .../qxmlsimplereader/tst_qxmlsimplereader.cpp | 14 +- .../shared/baselineprotocol.cpp | 14 +- .../baselineserver/shared/baselineprotocol.h | 14 +- tests/baselineserver/shared/lookup3.cpp | 14 +- tests/baselineserver/shared/qbaselinetest.cpp | 14 +- tests/baselineserver/shared/qbaselinetest.h | 14 +- tests/baselineserver/src/baselineserver.cpp | 14 +- tests/baselineserver/src/baselineserver.h | 14 +- tests/baselineserver/src/main.cpp | 14 +- tests/baselineserver/src/report.cpp | 14 +- tests/baselineserver/src/report.h | 14 +- .../corelib/codecs/qtextcodec/main.cpp | 14 +- .../io/qdir/10000/bench_qdir_10000.cpp | 14 +- .../corelib/io/qdir/tree/bench_qdir_tree.cpp | 14 +- .../corelib/io/qdiriterator/main.cpp | 14 +- .../io/qdiriterator/qfilesystemiterator.cpp | 14 +- .../io/qdiriterator/qfilesystemiterator.h | 14 +- tests/benchmarks/corelib/io/qfile/main.cpp | 14 +- .../benchmarks/corelib/io/qfileinfo/main.cpp | 14 +- .../benchmarks/corelib/io/qiodevice/main.cpp | 14 +- .../io/qprocess/testProcessLoopback/main.cpp | 14 +- .../io/qprocess/tst_bench_qprocess.cpp | 14 +- .../corelib/io/qtemporaryfile/main.cpp | 14 +- .../corelib/io/qtextstream/main.cpp | 34 ++- tests/benchmarks/corelib/io/qurl/main.cpp | 14 +- .../corelib/json/tst_bench_qtbinaryjson.cpp | 14 +- .../benchmarks/corelib/kernel/events/main.cpp | 14 +- .../corelib/kernel/qcoreapplication/main.cpp | 12 +- .../corelib/kernel/qmetaobject/main.cpp | 14 +- .../kernel/qmetatype/tst_qmetatype.cpp | 14 +- .../corelib/kernel/qobject/main.cpp | 14 +- .../corelib/kernel/qobject/object.cpp | 14 +- .../corelib/kernel/qobject/object.h | 14 +- .../tst_qtimer_vs_qmetaobject.cpp | 14 +- .../corelib/kernel/qvariant/tst_qvariant.cpp | 14 +- .../corelib/mimetypes/qmimedatabase/main.cpp | 14 +- .../corelib/plugin/quuid/tst_quuid.cpp | 14 +- .../corelib/thread/qmutex/tst_qmutex.cpp | 14 +- .../thread/qthreadpool/tst_qthreadpool.cpp | 12 +- .../qthreadstorage/tst_qthreadstorage.cpp | 14 +- .../qwaitcondition/tst_qwaitcondition.cpp | 14 +- .../tools/containers-associative/main.cpp | 14 +- .../tools/containers-sequential/main.cpp | 14 +- .../tools/qalgorithms/tst_qalgorithms.cpp | 14 +- .../corelib/tools/qbytearray/main.cpp | 14 +- tests/benchmarks/corelib/tools/qchar/main.cpp | 14 +- .../corelib/tools/qcontiguouscache/main.cpp | 14 +- .../corelib/tools/qcryptographichash/main.cpp | 12 +- .../corelib/tools/qdatetime/main.cpp | 14 +- tests/benchmarks/corelib/tools/qhash/main.cpp | 14 +- tests/benchmarks/corelib/tools/qhash/main.h | 14 +- .../corelib/tools/qhash/outofline.cpp | 14 +- tests/benchmarks/corelib/tools/qlist/main.cpp | 14 +- .../benchmarks/corelib/tools/qlocale/main.cpp | 14 +- tests/benchmarks/corelib/tools/qmap/main.cpp | 14 +- tests/benchmarks/corelib/tools/qrect/main.cpp | 14 +- .../benchmarks/corelib/tools/qregexp/main.cpp | 14 +- .../corelib/tools/qringbuffer/main.cpp | 14 +- tests/benchmarks/corelib/tools/qset/main.cpp | 14 +- .../benchmarks/corelib/tools/qstack/main.cpp | 12 +- .../benchmarks/corelib/tools/qstring/main.cpp | 14 +- .../corelib/tools/qstringbuilder/main.cpp | 14 +- .../corelib/tools/qstringlist/main.cpp | 14 +- .../benchmarks/corelib/tools/qvector/main.cpp | 14 +- .../corelib/tools/qvector/outofline.cpp | 14 +- .../corelib/tools/qvector/qrawvector.h | 14 +- .../dbus/qdbusperformance/server/server.cpp | 14 +- .../dbus/qdbusperformance/serverobject.h | 14 +- .../qdbusperformance/tst_qdbusperformance.cpp | 14 +- tests/benchmarks/dbus/qdbustype/main.cpp | 14 +- .../animation/qanimation/dummyanimation.cpp | 14 +- .../gui/animation/qanimation/dummyanimation.h | 14 +- .../gui/animation/qanimation/dummyobject.cpp | 14 +- .../gui/animation/qanimation/dummyobject.h | 14 +- .../gui/animation/qanimation/main.cpp | 14 +- .../animation/qanimation/rectanimation.cpp | 14 +- .../gui/animation/qanimation/rectanimation.h | 14 +- .../functional/GraphicsViewBenchmark/main.cpp | 14 +- .../widgets/abstractitemcontainer.cpp | 14 +- .../widgets/abstractitemcontainer.h | 14 +- .../widgets/abstractitemview.cpp | 14 +- .../widgets/abstractitemview.h | 14 +- .../widgets/abstractscrollarea.cpp | 14 +- .../widgets/abstractscrollarea.h | 14 +- .../widgets/abstractviewitem.cpp | 14 +- .../widgets/abstractviewitem.h | 14 +- .../widgets/backgrounditem.cpp | 14 +- .../widgets/backgrounditem.h | 14 +- .../GraphicsViewBenchmark/widgets/button.cpp | 14 +- .../GraphicsViewBenchmark/widgets/button.h | 14 +- .../widgets/commandline.cpp | 14 +- .../widgets/commandline.h | 14 +- .../widgets/dummydatagen.cpp | 14 +- .../widgets/dummydatagen.h | 14 +- .../widgets/gvbwidget.cpp | 14 +- .../GraphicsViewBenchmark/widgets/gvbwidget.h | 14 +- .../widgets/iconitem.cpp | 14 +- .../GraphicsViewBenchmark/widgets/iconitem.h | 14 +- .../widgets/itemrecyclinglist.cpp | 14 +- .../widgets/itemrecyclinglist.h | 14 +- .../widgets/itemrecyclinglistview.cpp | 14 +- .../widgets/itemrecyclinglistview.h | 14 +- .../GraphicsViewBenchmark/widgets/label.cpp | 14 +- .../GraphicsViewBenchmark/widgets/label.h | 14 +- .../widgets/listitem.cpp | 14 +- .../GraphicsViewBenchmark/widgets/listitem.h | 14 +- .../widgets/listitemcache.cpp | 14 +- .../widgets/listitemcache.h | 14 +- .../widgets/listitemcontainer.cpp | 14 +- .../widgets/listitemcontainer.h | 14 +- .../widgets/listmodel.cpp | 14 +- .../GraphicsViewBenchmark/widgets/listmodel.h | 14 +- .../widgets/listwidget.cpp | 14 +- .../widgets/listwidget.h | 14 +- .../widgets/mainview.cpp | 14 +- .../GraphicsViewBenchmark/widgets/mainview.h | 14 +- .../GraphicsViewBenchmark/widgets/menu.cpp | 14 +- .../GraphicsViewBenchmark/widgets/menu.h | 14 +- .../widgets/recycledlistitem.cpp | 14 +- .../widgets/recycledlistitem.h | 14 +- .../widgets/resourcemoninterface.h | 14 +- .../widgets/scrollbar.cpp | 14 +- .../GraphicsViewBenchmark/widgets/scrollbar.h | 14 +- .../widgets/scroller.cpp | 14 +- .../GraphicsViewBenchmark/widgets/scroller.h | 14 +- .../widgets/scroller_p.h | 14 +- .../widgets/settings.cpp | 14 +- .../GraphicsViewBenchmark/widgets/settings.h | 14 +- .../widgets/simplelist.cpp | 14 +- .../widgets/simplelist.h | 14 +- .../widgets/simplelistview.cpp | 14 +- .../widgets/simplelistview.h | 14 +- .../GraphicsViewBenchmark/widgets/theme.cpp | 14 +- .../GraphicsViewBenchmark/widgets/theme.h | 14 +- .../widgets/themeevent.cpp | 14 +- .../widgets/themeevent.h | 14 +- .../GraphicsViewBenchmark/widgets/topbar.cpp | 14 +- .../GraphicsViewBenchmark/widgets/topbar.h | 14 +- .../GraphicsViewBenchmark/widgets/webview.cpp | 14 +- .../GraphicsViewBenchmark/widgets/webview.h | 14 +- .../GraphicsViewBenchmark/widgets/webview_p.h | 14 +- .../tst_qgraphicsanchorlayout.cpp | 14 +- .../qgraphicsitem/tst_qgraphicsitem.cpp | 14 +- .../qgraphicslayout/tst_qgraphicslayout.cpp | 14 +- .../tst_qgraphicslinearlayout.cpp | 14 +- .../qgraphicsscene/tst_qgraphicsscene.cpp | 14 +- .../qgraphicsview/benchapps/chipTest/chip.cpp | 14 +- .../qgraphicsview/benchapps/chipTest/chip.h | 14 +- .../qgraphicsview/benchapps/chipTest/main.cpp | 14 +- .../benchapps/chipTest/mainwindow.cpp | 14 +- .../benchapps/chipTest/mainwindow.h | 14 +- .../qgraphicsview/benchapps/chipTest/view.cpp | 14 +- .../qgraphicsview/benchapps/chipTest/view.h | 14 +- .../benchapps/moveItems/main.cpp | 14 +- .../benchapps/scrolltest/main.cpp | 14 +- .../qgraphicsview/chiptester/chip.cpp | 14 +- .../qgraphicsview/chiptester/chip.h | 14 +- .../qgraphicsview/chiptester/chiptester.cpp | 14 +- .../qgraphicsview/chiptester/chiptester.h | 14 +- .../qgraphicsview/tst_qgraphicsview.cpp | 14 +- .../qgraphicswidget/tst_qgraphicswidget.cpp | 14 +- .../benchmarks/gui/image/blendbench/main.cpp | 14 +- .../qimageconversion/tst_qimageconversion.cpp | 14 +- .../image/qimagereader/tst_qimagereader.cpp | 14 +- .../gui/image/qpixmap/tst_qpixmap.cpp | 14 +- .../image/qpixmapcache/tst_qpixmapcache.cpp | 14 +- .../qheaderview/qheaderviewbench.cpp | 12 +- .../itemviews/qtableview/tst_qtableview.cpp | 14 +- .../gui/kernel/qapplication/main.cpp | 14 +- .../kernel/qguimetatype/tst_qguimetatype.cpp | 14 +- .../kernel/qguivariant/tst_qguivariant.cpp | 14 +- .../gui/kernel/qwidget/tst_qwidget.cpp | 14 +- .../gui/math3d/qmatrix4x4/tst_qmatrix4x4.cpp | 14 +- .../math3d/qquaternion/tst_qquaternion.cpp | 14 +- .../gui/painting/qpainter/tst_qpainter.cpp | 14 +- .../benchmarks/gui/painting/qregion/main.cpp | 14 +- .../gui/painting/qtbench/benchmarktests.h | 14 +- .../gui/painting/qtbench/tst_qtbench.cpp | 14 +- .../painting/qtransform/tst_qtransform.cpp | 14 +- .../gui/styles/qstylesheetstyle/main.cpp | 14 +- .../benchmarks/gui/text/qfontmetrics/main.cpp | 14 +- tests/benchmarks/gui/text/qtext/main.cpp | 14 +- .../qfile_vs_qnetworkaccessmanager/main.cpp | 14 +- .../tst_qnetworkdiskcache.cpp | 14 +- .../qnetworkreply/tst_qnetworkreply.cpp | 14 +- .../tst_qnetworkreply_from_cache.cpp | 12 +- .../network/kernel/qhostinfo/main.cpp | 14 +- .../socket/qtcpserver/tst_qtcpserver.cpp | 14 +- .../network/ssl/qsslsocket/tst_qsslsocket.cpp | 14 +- tests/benchmarks/opengl/main.cpp | 14 +- .../plugins/imageformats/jpeg/jpeg.cpp | 14 +- .../benchmarks/sql/kernel/qsqlquery/main.cpp | 14 +- tests/manual/bearerex/bearerex.cpp | 14 +- tests/manual/bearerex/bearerex.h | 14 +- tests/manual/bearerex/datatransferer.cpp | 14 +- tests/manual/bearerex/datatransferer.h | 14 +- tests/manual/bearerex/main.cpp | 14 +- tests/manual/bearerex/xqlistwidget.cpp | 14 +- tests/manual/bearerex/xqlistwidget.h | 14 +- tests/manual/cocoa/menus/main.cpp | 12 +- tests/manual/cocoa/nativewidgets/main.cpp | 14 +- .../TestMouseMovedNSView.h | 14 +- .../TestMouseMovedNSView.m | 36 ++- .../cocoa/qmaccocoaviewcontainer/main.mm | 36 ++- tests/manual/cocoa/qsystemtrayicon/main.cpp | 36 ++- tests/manual/cocoa/qt_on_cocoa/main.mm | 36 ++- tests/manual/cocoa/qt_on_cocoa/window.cpp | 14 +- tests/manual/cocoa/qt_on_cocoa/window.h | 14 +- tests/manual/cocoa/wheelevent/main.cpp | 14 +- tests/manual/cocoa/wheelevent/window.cpp | 14 +- tests/manual/cocoa/wheelevent/window.h | 14 +- tests/manual/corelib/tools/qhash/main.cpp | 12 +- tests/manual/corelib/tools/qlist/main.cpp | 12 +- tests/manual/corelib/tools/qmap/main.cpp | 12 +- tests/manual/corelib/tools/qset/main.cpp | 12 +- .../corelib/tools/qvarlengtharray/main.cpp | 12 +- tests/manual/corelib/tools/qvector/main.cpp | 12 +- tests/manual/diaglib/eventfilter.cpp | 14 +- tests/manual/diaglib/eventfilter.h | 14 +- tests/manual/diaglib/glinfo.cpp | 14 +- tests/manual/diaglib/glinfo.h | 14 +- tests/manual/diaglib/nativewindowdump.cpp | 14 +- tests/manual/diaglib/nativewindowdump.h | 14 +- tests/manual/diaglib/nativewindowdump_win.cpp | 14 +- tests/manual/diaglib/qwidgetdump.cpp | 14 +- tests/manual/diaglib/qwidgetdump.h | 14 +- tests/manual/diaglib/qwindowdump.cpp | 14 +- tests/manual/diaglib/qwindowdump.h | 14 +- tests/manual/diaglib/textdump.cpp | 14 +- tests/manual/diaglib/textdump.h | 14 +- tests/manual/dialogs/colordialogpanel.cpp | 14 +- tests/manual/dialogs/colordialogpanel.h | 14 +- tests/manual/dialogs/filedialogpanel.cpp | 14 +- tests/manual/dialogs/filedialogpanel.h | 14 +- tests/manual/dialogs/fontdialogpanel.cpp | 14 +- tests/manual/dialogs/fontdialogpanel.h | 14 +- tests/manual/dialogs/main.cpp | 14 +- tests/manual/dialogs/messageboxpanel.cpp | 12 +- tests/manual/dialogs/messageboxpanel.h | 12 +- tests/manual/dialogs/printdialogpanel.cpp | 14 +- tests/manual/dialogs/printdialogpanel.h | 14 +- tests/manual/dialogs/utils.cpp | 14 +- tests/manual/dialogs/utils.h | 14 +- tests/manual/dialogs/wizardpanel.cpp | 14 +- tests/manual/dialogs/wizardpanel.h | 14 +- tests/manual/filetest/main.cpp | 14 +- .../manual/gestures/graphicsview/gestures.cpp | 14 +- tests/manual/gestures/graphicsview/gestures.h | 14 +- .../gestures/graphicsview/imageitem.cpp | 14 +- .../manual/gestures/graphicsview/imageitem.h | 14 +- tests/manual/gestures/graphicsview/main.cpp | 14 +- .../mousepangesturerecognizer.cpp | 14 +- .../graphicsview/mousepangesturerecognizer.h | 14 +- tests/manual/gestures/scrollarea/main.cpp | 14 +- .../scrollarea/mousepangesturerecognizer.cpp | 14 +- .../scrollarea/mousepangesturerecognizer.h | 14 +- tests/manual/highdpi/main.cpp | 14 +- .../inputmethodhints/inputmethodhints.cpp | 14 +- .../inputmethodhints/inputmethodhints.h | 14 +- tests/manual/inputmethodhints/main.cpp | 14 +- tests/manual/keypadnavigation/main.cpp | 14 +- tests/manual/lance/interactivewidget.cpp | 14 +- tests/manual/lance/interactivewidget.h | 14 +- tests/manual/lance/main.cpp | 14 +- tests/manual/lance/widgets.h | 14 +- tests/manual/mkspecs/test.sh | 36 ++- .../tst_network_remote_stresstest.cpp | 14 +- .../network_stresstest/minihttpserver.cpp | 14 +- .../network_stresstest/minihttpserver.h | 14 +- .../tst_network_stresstest.cpp | 14 +- tests/manual/qcursor/allcursors/main.cpp | 14 +- .../manual/qcursor/allcursors/mainwindow.cpp | 14 +- tests/manual/qcursor/allcursors/mainwindow.h | 14 +- tests/manual/qcursor/grab_override/main.cpp | 14 +- .../qcursor/grab_override/mainwindow.cpp | 14 +- .../manual/qcursor/grab_override/mainwindow.h | 14 +- .../qdesktopservices/tst_qdesktopservices.cpp | 12 +- tests/manual/qdesktopwidget/main.cpp | 14 +- tests/manual/qgraphicsitem/main.cpp | 14 +- .../manual/qgraphicsitemgroup/customitem.cpp | 14 +- tests/manual/qgraphicsitemgroup/customitem.h | 14 +- tests/manual/qgraphicsitemgroup/main.cpp | 14 +- tests/manual/qgraphicsitemgroup/widget.cpp | 14 +- tests/manual/qgraphicsitemgroup/widget.h | 14 +- tests/manual/qgraphicslayout/flicker/main.cpp | 14 +- .../manual/qgraphicslayout/flicker/window.cpp | 14 +- tests/manual/qgraphicslayout/flicker/window.h | 14 +- tests/manual/qhttpnetworkconnection/main.cpp | 14 +- tests/manual/qimagereader/main.cpp | 14 +- tests/manual/qlayout/gridwidget.cpp | 14 +- tests/manual/qlayout/gridwidget.h | 14 +- tests/manual/qlayout/hbwidget.cpp | 14 +- tests/manual/qlayout/hbwidget.h | 14 +- tests/manual/qlayout/main.cpp | 14 +- tests/manual/qlayout/mainwindow.cpp | 14 +- tests/manual/qlayout/mainwindow.h | 14 +- tests/manual/qlayout/vbwidget.cpp | 14 +- tests/manual/qlayout/vbwidget.h | 14 +- tests/manual/qlocale/calendar.cpp | 10 +- tests/manual/qlocale/calendar.h | 10 +- tests/manual/qlocale/currency.cpp | 10 +- tests/manual/qlocale/currency.h | 10 +- tests/manual/qlocale/dateformats.cpp | 10 +- tests/manual/qlocale/dateformats.h | 10 +- tests/manual/qlocale/info.cpp | 10 +- tests/manual/qlocale/info.h | 10 +- tests/manual/qlocale/languages.cpp | 10 +- tests/manual/qlocale/languages.h | 10 +- tests/manual/qlocale/main.cpp | 10 +- tests/manual/qlocale/miscellaneous.cpp | 10 +- tests/manual/qlocale/miscellaneous.h | 10 +- tests/manual/qlocale/numberformats.cpp | 10 +- tests/manual/qlocale/numberformats.h | 10 +- tests/manual/qlocale/window.cpp | 10 +- tests/manual/qlocale/window.h | 10 +- .../qmetatype/declare_metatype_noninline.cpp | 12 +- .../qmetatype/declare_metatype_noninline.h | 12 +- tests/manual/qmetatype/tst_qmetatype.cpp | 12 +- .../qget/downloadmanager.cpp | 14 +- .../qnetworkaccessmanager/qget/qget.cpp | 14 +- .../manual/qnetworkaccessmanager/qget/qget.h | 14 +- .../qget/transferitem.cpp | 14 +- tests/manual/qnetworkconfiguration/main.cpp | 12 +- .../qnetworkconfigurationmanager/main.cpp | 14 +- tests/manual/qnetworkreply/main.cpp | 14 +- tests/manual/qopenglcontext/main.cpp | 14 +- .../qopenglcontext/qopenglcontextwindow.cpp | 14 +- .../qopenglcontext/qopenglcontextwindow.h | 14 +- tests/manual/qopengltextureblitter/main.cpp | 14 +- .../qopengltextureblitwindow.cpp | 14 +- .../qopengltextureblitwindow.h | 14 +- .../qopenglwidget/openglwidget/main.cpp | 14 +- .../openglwidget/openglwidget.cpp | 14 +- .../qopenglwidget/openglwidget/openglwidget.h | 14 +- .../manual/qopenglwindow/multiwindow/main.cpp | 36 ++- tests/manual/qprintdevice_dump/main.cpp | 12 +- tests/manual/qscreen/main.cpp | 14 +- tests/manual/qscreen/propertyfield.cpp | 14 +- tests/manual/qscreen/propertyfield.h | 14 +- tests/manual/qscreen/propertywatcher.cpp | 14 +- tests/manual/qscreen/propertywatcher.h | 14 +- tests/manual/qssloptions/main.cpp | 14 +- tests/manual/qsslsocket/main.cpp | 12 +- .../qtabletevent/device_information/main.cpp | 14 +- .../device_information/tabletwidget.cpp | 14 +- .../device_information/tabletwidget.h | 14 +- .../qtabletevent/event_compression/main.cpp | 14 +- .../event_compression/mousestatwidget.cpp | 14 +- .../event_compression/mousestatwidget.h | 14 +- .../qtabletevent/regular_widgets/main.cpp | 14 +- tests/manual/qtbug-8933/main.cpp | 14 +- tests/manual/qtbug-8933/widget.cpp | 14 +- tests/manual/qtbug-8933/widget.h | 14 +- tests/manual/qtexteditlist/main.cpp | 14 +- tests/manual/qtexteditlist/widget.cpp | 14 +- tests/manual/qtexteditlist/widget.h | 14 +- tests/manual/qtouchevent/main.cpp | 14 +- tests/manual/qtouchevent/touchwidget.cpp | 14 +- tests/manual/qtouchevent/touchwidget.h | 14 +- tests/manual/qwidget_zorder/main.cpp | 14 +- tests/manual/repaint/mainwindow/main.cpp | 14 +- tests/manual/repaint/scrollarea/main.cpp | 14 +- tests/manual/repaint/shared/shared.h | 14 +- tests/manual/repaint/splitter/main.cpp | 14 +- tests/manual/repaint/tableview/main.cpp | 14 +- tests/manual/repaint/task141091/main.cpp | 14 +- tests/manual/repaint/toplevel/main.cpp | 14 +- tests/manual/repaint/widget/main.cpp | 14 +- tests/manual/shortcuts/main.cpp | 14 +- tests/manual/socketengine/main.cpp | 14 +- .../textrendering/glyphshaping/main.cpp | 14 +- .../textrendering/textperformance/main.cpp | 14 +- tests/manual/touch/main.cpp | 14 +- tests/manual/transientwindow/main.cpp | 14 +- tests/manual/transientwindow/mainwindow.cpp | 14 +- tests/manual/transientwindow/mainwindow.h | 14 +- tests/manual/unc/main.cpp | 14 +- tests/manual/widgetgrab/main.cpp | 14 +- .../tablehorz/testtable1.cpp | 12 +- .../tablevert/testtable2.cpp | 12 +- .../autoResizePrecision/treeview/testtree.cpp | 12 +- .../widgets/itemviews/delegate/example.cpp | 12 +- .../qheaderview/qheaderviewtest1.cpp | 12 +- .../widgets/itemviews/qtreeview/main.cpp | 14 +- .../widgets/itemviews/qtreewidget/main.cpp | 12 +- .../tableview-span-navigation/main.cpp | 12 +- .../widgets/kernel/layoutreplace/main.cpp | 12 +- tests/manual/widgets/kernel/qtooltip/main.cpp | 12 +- .../manual/widgets/kernel/sizeonhide/main.cpp | 12 +- .../rubberband/rubberbandtest.cpp | 12 +- .../windowchildgeometry/controllerwidget.cpp | 14 +- .../windowchildgeometry/controllerwidget.h | 14 +- tests/manual/windowchildgeometry/main.cpp | 14 +- tests/manual/windowflags/controllerwindow.cpp | 14 +- tests/manual/windowflags/controllerwindow.h | 14 +- tests/manual/windowflags/controls.cpp | 14 +- tests/manual/windowflags/controls.h | 14 +- tests/manual/windowflags/main.cpp | 14 +- tests/manual/windowflags/previewwindow.cpp | 14 +- tests/manual/windowflags/previewwindow.h | 14 +- .../windowgeometry/controllerwidget.cpp | 14 +- .../manual/windowgeometry/controllerwidget.h | 14 +- tests/manual/windowgeometry/main.cpp | 14 +- tests/manual/windowmodality/main.cpp | 14 +- .../windowtransparency/windowtransparency.cpp | 10 +- tests/manual/xcb_gl_integration/main.cpp | 38 ++- tests/manual/xembed-raster/gtk-embedder.py | 34 ++- tests/manual/xembed-raster/main.cpp | 10 +- tests/manual/xembed-raster/rasterwindow.cpp | 10 +- tests/manual/xembed-raster/rasterwindow.h | 10 +- tests/manual/xembed-widgets/gtk-embedder.py | 34 ++- tests/manual/xembed-widgets/main.cpp | 10 +- tests/manual/xembed-widgets/window.cpp | 10 +- tests/manual/xembed-widgets/window.h | 10 +- tests/shared/fakedirmodel.h | 14 +- tests/shared/filesystem.h | 14 +- tools/configure/configure_pch.h | 14 +- tools/configure/configureapp.cpp | 16 +- tools/configure/configureapp.h | 14 +- tools/configure/environment.cpp | 14 +- tools/configure/environment.h | 14 +- tools/configure/main.cpp | 14 +- tools/configure/tools.cpp | 14 +- tools/configure/tools.h | 14 +- tools/shared/windows/registry.cpp | 14 +- tools/shared/windows/registry_p.h | 14 +- .../accessibilityinspector.cpp | 14 +- .../accessibilityinspector.h | 14 +- .../accessibilityscenemanager.cpp | 14 +- .../accessibilityscenemanager.h | 14 +- util/accessibilityinspector/main.cpp | 14 +- util/accessibilityinspector/optionswidget.cpp | 14 +- util/accessibilityinspector/optionswidget.h | 14 +- util/accessibilityinspector/screenreader.cpp | 14 +- util/accessibilityinspector/screenreader.h | 14 +- util/aglfn/main.cpp | 28 +-- util/corelib/qurl-generateTLDs/main.cpp | 14 +- util/glgen/codegenerator.cpp | 12 +- util/glgen/codegenerator.h | 12 +- util/glgen/legacyspecparser.cpp | 12 +- util/glgen/legacyspecparser.h | 34 ++- util/glgen/main.cpp | 12 +- util/glgen/qopenglextensions.cpp.header | 8 +- util/glgen/qopenglextensions.h.header | 8 +- util/glgen/qopenglversionfunctions.cpp.header | 34 ++- util/glgen/qopenglversionfunctions.h.header | 34 ++- ...englversionfunctions__VERSION__.cpp.header | 36 ++- ...openglversionfunctions__VERSION__.h.header | 36 ++- .../qopenglversionfunctionsfactory.cpp.header | 36 ++- .../qopenglversionfunctionsfactory_p.h.header | 34 ++- util/glgen/specparser.h | 12 +- util/glgen/xmlspecparser.cpp | 34 ++- util/glgen/xmlspecparser.h | 34 ++- util/lexgen/configfile.cpp | 14 +- util/lexgen/configfile.h | 14 +- util/lexgen/generator.cpp | 14 +- util/lexgen/generator.h | 14 +- util/lexgen/global.h | 14 +- util/lexgen/main.cpp | 14 +- util/lexgen/nfa.cpp | 14 +- util/lexgen/nfa.h | 14 +- util/lexgen/re2nfa.cpp | 14 +- util/lexgen/re2nfa.h | 14 +- util/lexgen/tests/tst_lexgen.cpp | 14 +- util/lexgen/tokenizer.cpp | 14 +- util/local_database/cldr2qlocalexml.py | 36 ++- util/local_database/cldr2qtimezone.py | 36 ++- util/local_database/dateconverter.py | 36 ++- util/local_database/enumdata.py | 36 ++- util/local_database/qlocalexml2cpp.py | 36 ++- .../testlocales/localemodel.cpp | 14 +- util/local_database/testlocales/localemodel.h | 14 +- .../testlocales/localewidget.cpp | 14 +- .../local_database/testlocales/localewidget.h | 14 +- util/local_database/testlocales/main.cpp | 14 +- util/local_database/xpathlite.py | 36 ++- util/plugintest/main.cpp | 14 +- util/unicode/codecs/big5/main.cpp | 14 +- util/unicode/main.cpp | 28 +-- util/unicode/writingSystems.sh | 39 ++-- util/xkbdatagen/main.cpp | 28 +-- 6860 files changed, 46112 insertions(+), 48320 deletions(-) delete mode 100644 header.LGPL create mode 100644 header.LGPL3-COMM diff --git a/LGPL_EXCEPTION.txt b/LGPL_EXCEPTION.txt index 7e2e30ff9b..5cdacb9a4e 100644 --- a/LGPL_EXCEPTION.txt +++ b/LGPL_EXCEPTION.txt @@ -1,4 +1,4 @@ -Digia Qt LGPL Exception version 1.1 +The Qt Company Qt LGPL Exception version 1.1 As an additional permission to the GNU Lesser General Public License version 2.1, the object code form of a "work that uses the Library" may incorporate diff --git a/LICENSE.LGPLv21 b/LICENSE.LGPLv21 index d26836dccc..6e18461125 100644 --- a/LICENSE.LGPLv21 +++ b/LICENSE.LGPLv21 @@ -1,7 +1,7 @@ GNU LESSER GENERAL PUBLIC LICENSE - The Qt Toolkit is Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies). - Contact: http://www.qt-project.org/legal + The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd. + Contact: http://www.qt.io/licensing/ You may use, distribute and copy the Qt GUI Toolkit under the terms of GNU Lesser General Public License version 2.1, which is displayed below. diff --git a/LICENSE.LGPLv3 b/LICENSE.LGPLv3 index 747fb695c0..8fbb74390c 100644 --- a/LICENSE.LGPLv3 +++ b/LICENSE.LGPLv3 @@ -1,7 +1,7 @@ GNU LESSER GENERAL PUBLIC LICENSE - The Qt Toolkit is Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies). - Contact: http://www.qt-project.org/legal + The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd. + Contact: http://www.qt.io/licensing/ You may use, distribute and copy the Qt GUI Toolkit under the terms of GNU Lesser General Public License version 3, which is displayed below. diff --git a/LICENSE.PREVIEW.COMMERCIAL b/LICENSE.PREVIEW.COMMERCIAL index 15e61fc19e..0f96e738c7 100644 --- a/LICENSE.PREVIEW.COMMERCIAL +++ b/LICENSE.PREVIEW.COMMERCIAL @@ -14,10 +14,10 @@ TECHNOLOGY PREVIEW LICENSE AGREEMENT: The Americas Agreement version 2.4 This Technology Preview License Agreement ("Agreement")is a legal agreement -between Digia USA, Inc. ("Digia"), with its registered office at 2350 -Mission College Blvd., Suite 1020, Santa Clara, California 95054, -U.S.A. and you (either an individual or a legal entity) ("Licensee") for the -Licensed Software (as defined below). +between The Qt Company USA, Inc. ("The Qt Company"), with its registered +office at 2350 Mission College Blvd., Suite 1020, Santa Clara, California +95054, U.S.A. and you (either an individual or a legal entity) ("Licensee") +for the Licensed Software (as defined below). 1. DEFINITIONS @@ -35,16 +35,16 @@ Licensed Software which may include portions of the Licensed Software. "Term" shall mean the period of time six (6) months from the later of (a) the Effective Date; or (b) the date the Licensed Software was -initially delivered to Licensee by Digia. If no specific Effective Date -is set forth in the Agreement, the Effective Date shall be deemed to be +initially delivered to Licensee by The Qt Company. If no specific Effective +Date is set forth in the Agreement, the Effective Date shall be deemed to be the date the Licensed Software was initially delivered to Licensee. "Licensed Software" shall mean the computer software, "online" or electronic documentation, associated media and printed materials, including the source code, example programs and the documentation -delivered by Digia to Licensee in conjunction with this Agreement. +delivered by The Qt Company to Licensee in conjunction with this Agreement. -"Party" or "Parties" shall mean Licensee and/or Digia. +"Party" or "Parties" shall mean Licensee and/or The Qt Company. 2. OWNERSHIP @@ -54,18 +54,18 @@ copyright treaties, as well as other intellectual property laws and treaties. The Licensed Software is licensed, not sold. If Licensee provides any findings, proposals, suggestions or other -feedback ("Feedback") to Digia regarding the Licensed Software, Digia -shall own all right, title and interest including the intellectual -property rights in and to such Feedback, excluding however any existing -patent rights of Licensee. To the extent Licensee owns or controls any -patents for such Feedback Licensee hereby grants to Digia and its +feedback ("Feedback") to The Qt Company regarding the Licensed Software, +The Qt Company shall own all right, title and interest including the +intellectual property rights in and to such Feedback, excluding however any +existing patent rights of Licensee. To the extent Licensee owns or controls +any patents for such Feedback Licensee hereby grants to The Qt Company and its Affiliates, a worldwide, perpetual, non-transferable, sublicensable, royalty-free license to (i) use, copy and modify Feedback and to create derivative works thereof, (ii) to make (and have made), use, import, sell, offer for sale, lease, dispose, offer for disposal or otherwise -exploit any products or services of Digia containing Feedback, and +exploit any products or services of The Qt Company containing Feedback, and (iii) sublicense all the foregoing rights to third party licensees and -customers of Digia and/or its Affiliates. +customers of The Qt Company and/or its Affiliates. 3. VALIDITY OF THE AGREEMENT @@ -74,17 +74,17 @@ By installing, copying, or otherwise using the Licensed Software, Licensee agrees to be bound by the terms of this Agreement. If Licensee does not agree to the terms of this Agreement, Licensee may not install, copy, or otherwise use the Licensed Software. Upon Licensee's acceptance -of the terms and conditions of this Agreement, Digia grants Licensee the -right to use the Licensed Software in the manner provided below. +of the terms and conditions of this Agreement, The Qt Company grants Licensee +the right to use the Licensed Software in the manner provided below. 4. LICENSES 4.1. Using and Copying -Digia grants to Licensee a non-exclusive, non-transferable, time-limited -license to use and copy the Licensed Software for sole purpose of -designing, developing and testing Applications, and evaluating and the +The Qt Company grants to Licensee a non-exclusive, non-transferable, +time-limited license to use and copy the Licensed Software for sole purpose +of designing, developing and testing Applications, and evaluating and the Licensed Software during the Term. Licensee may install copies of the Licensed Software on an unlimited @@ -104,8 +104,8 @@ software statically or dynamically linked with the Licensed Software. 4.3 No Technical Support -Digia has no obligation to furnish Licensee with any technical support -whatsoever. Any such support is subject to separate agreement between +The Qt Company has no obligation to furnish Licensee with any technical +support whatsoever. Any such support is subject to separate agreement between the Parties. @@ -114,7 +114,7 @@ The Licensed Software contains pre-release code that is not at the level of performance and compatibility of a final, generally available, product offering. The Licensed Software may not operate correctly and may be substantially modified prior to the first commercial product -release, if any. Digia is not obligated to make this or any later +release, if any. The Qt Company is not obligated to make this or any later version of the Licensed Software commercially available. The License Software is "Not for Commercial Use" and may only be used for the purposes described in Section 4. The Licensed Software may not be used @@ -143,8 +143,8 @@ appropriate licensing from such third parties. 7. LIMITED WARRANTY AND WARRANTY DISCLAIMER The Licensed Software is licensed to Licensee "as is". To the maximum -extent permitted by applicable law, Digia on behalf of itself and its -suppliers, disclaims all warranties and conditions, either express or +extent permitted by applicable law, The Qt Company on behalf of itself and +its suppliers, disclaims all warranties and conditions, either express or implied, including, but not limited to, implied warranties of merchantability, fitness for a particular purpose, title and non-infringement with regard to the Licensed Software. @@ -152,21 +152,21 @@ non-infringement with regard to the Licensed Software. 8. LIMITATION OF LIABILITY -If, Digia's warranty disclaimer notwithstanding, Digia is held liable to -Licensee, whether in contract, tort or any other legal theory, based on -the Licensed Software, Digia's entire liability to Licensee and -Licensee's exclusive remedy shall be, at Digia's option, either (A) -return of the price Licensee paid for the Licensed Software, or (B) +If, The Qt Company's warranty disclaimer notwithstanding, The Qt Company is +held liable to Licensee, whether in contract, tort or any other legal theory, +based on the Licensed Software, The Qt Company's entire liability to Licensee +and Licensee's exclusive remedy shall be, at The Qt Company's option, either +(A) return of the price Licensee paid for the Licensed Software, or (B) repair or replacement of the Licensed Software, provided Licensee -returns to Digia all copies of the Licensed Software as originally -delivered to Licensee. Digia shall not under any circumstances be liable -to Licensee based on failure of the Licensed Software if the failure -resulted from accident, abuse or misapplication, nor shall Digia under -any circumstances be liable for special damages, punitive or exemplary +returns to The Qt Company all copies of the Licensed Software as originally +delivered to Licensee. The Qt Company shall not under any circumstances be +liable to Licensee based on failure of the Licensed Software if the failure +resulted from accident, abuse or misapplication, nor shall The Qt Company +under any circumstances be liable for special damages, punitive or exemplary damages, damages for loss of profits or interruption of business or for -loss or corruption of data. Any award of damages from Digia to Licensee -shall not exceed the total amount Licensee has paid to Digia in -connection with this Agreement. +loss or corruption of data. Any award of damages from The Qt Company to +Licensee shall not exceed the total amount Licensee has paid to The Qt +Company in connection with this Agreement. 9. CONFIDENTIALITY @@ -212,7 +212,7 @@ by all legally available means. The obligations of the Receiving Party under this Section shall continue during the Initial Term and for a period of five (5) years after expiration or termination of this Agreement. To the extent that the -terms of the Non-Disclosure Agreement between Digia and Licensee +terms of the Non-Disclosure Agreement between The Qt Company and Licensee conflict with the terms of this Section 9, this Section 9 shall be controlling over the terms of the Non-Disclosure Agreement. @@ -223,18 +223,19 @@ controlling over the terms of the Non-Disclosure Agreement. Licensee shall not be entitled to assign or transfer all or any of its rights, benefits and obligations under this Agreement without the prior -written consent of Digia, which shall not be unreasonably withheld. +written consent of The Qt Company, which shall not be unreasonably withheld. 10.2 Termination -Digia may terminate the Agreement at any time immediately upon written -notice by Digia to Licensee if Licensee breaches this Agreement. +The Qt Company may terminate the Agreement at any time immediately upon +written notice by The Qt Company to Licensee if Licensee breaches this +Agreement. -Upon termination of this Agreement, Licensee shall return to Digia all -copies of Licensed Software that were supplied by Digia. All other -copies of Licensed Software in the possession or control of Licensee +Upon termination of this Agreement, Licensee shall return to The Qt Company +all copies of Licensed Software that were supplied by The Qt Company. All +other copies of Licensed Software in the possession or control of Licensee must be erased or destroyed. An officer of Licensee must promptly -deliver to Digia a written confirmation that this has occurred. +deliver to The Qt Company a written confirmation that this has occurred. 10.3 Surviving Sections @@ -255,12 +256,12 @@ Agreement ("Non-Disclosure Agreement"), if any, shall be subject to Section 9. No modification of this Agreement shall be effective unless contained in a writing executed by an authorized representative of each party. No term or condition contained in Licensee's purchase order shall -apply unless expressly accepted by Digia in writing. If any provision of -the Agreement is found void or unenforceable, the remainder shall remain -valid and enforceable according to its terms. If any remedy provided is -determined to have failed for its essential purpose, all limitations of -liability and exclusions of damages set forth in this Agreement shall -remain in effect. +apply unless expressly accepted by The Qt Company in writing. If any +provision of the Agreement is found void or unenforceable, the remainder +shall remain valid and enforceable according to its terms. If any remedy +provided is determined to have failed for its essential purpose, all +limitations of liability and exclusions of damages set forth in this +Agreement shall remain in effect. 10.5 Export Control @@ -301,9 +302,9 @@ infringement, whether or not such action relates to this Agreement. There are no implied licenses or other implied rights granted under this Agreement, and all rights, save for those expressly granted hereunder, -shall remain with Digia and its licensors. In addition, no licenses or -immunities are granted to the combination of the Licensed Software with -any other software or hardware not delivered by Digia under this +shall remain with The Qt Company and its licensors. In addition, no licenses +or immunities are granted to the combination of the Licensed Software with +any other software or hardware not delivered by The Qt Company under this Agreement. 10.8 Government End Users @@ -329,9 +330,9 @@ TECHNOLOGY PREVIEW LICENSE AGREEMENT: Rest of the World Agreement version 2.4 This Technology Preview License Agreement ("Agreement") is a legal -agreement between Digia Finland Ltd ("Digia"), with its registered office at -Valimotie 21,FI-00380 Helsinki, Finland and you (either an individual or a -legal entity) ("Licensee") for the Licensed Software. +agreement between The Qt Company Ltd ("The Qt Company"), with its registered +office at Valimotie 21,FI-00380 Helsinki, Finland and you (either an +individual or a legal entity) ("Licensee") for the Licensed Software. 1. DEFINITIONS @@ -349,16 +350,16 @@ Licensed Software which may include portions of the Licensed Software. "Term" shall mean the period of time six (6) months from the later of (a) the Effective Date; or (b) the date the Licensed Software was -initially delivered to Licensee by Digia. If no specific Effective Date -is set forth in the Agreement, the Effective Date shall be deemed to be +initially delivered to Licensee by The Qt Company. If no specific Effective +Date is set forth in the Agreement, the Effective Date shall be deemed to be the date the Licensed Software was initially delivered to Licensee. "Licensed Software" shall mean the computer software, "online" or electronic documentation, associated media and printed materials, including the source code, example programs and the documentation -delivered by Digia to Licensee in conjunction with this Agreement. +delivered by The Qt Company to Licensee in conjunction with this Agreement. -"Party" or "Parties" shall mean Licensee and/or Digia. +"Party" or "Parties" shall mean Licensee and/or The Qt Company. 2. OWNERSHIP @@ -368,18 +369,18 @@ copyright treaties, as well as other intellectual property laws and treaties. The Licensed Software is licensed, not sold. If Licensee provides any findings, proposals, suggestions or other -feedback ("Feedback") to Digia regarding the Licensed Software, Digia -shall own all right, title and interest including the intellectual -property rights in and to such Feedback, excluding however any existing -patent rights of Licensee. To the extent Licensee owns or controls any -patents for such Feedback Licensee hereby grants to Digia and its -Affiliates, a worldwide, perpetual, non-transferable, sublicensable, +feedback ("Feedback") to The Qt Company regarding the Licensed Software, +The Qt Companyshall own all right, title and interest including the +intellectual property rights in and to such Feedback, excluding however any +existing patent rights of Licensee. To the extent Licensee owns or controls +any patents for such Feedback Licensee hereby grants to The Qt Company and +its Affiliates, a worldwide, perpetual, non-transferable, sublicensable, royalty-free license to (i) use, copy and modify Feedback and to create derivative works thereof, (ii) to make (and have made), use, import, sell, offer for sale, lease, dispose, offer for disposal or otherwise -exploit any products or services of Digia containing Feedback, and +exploit any products or services of The Qt Company containing Feedback, and (iii) sublicense all the foregoing rights to third party licensees and -customers of Digia and/or its Affiliates. +customers of The Qt Company and/or its Affiliates. 3. VALIDITY OF THE AGREEMENT @@ -387,17 +388,17 @@ By installing, copying, or otherwise using the Licensed Software, Licensee agrees to be bound by the terms of this Agreement. If Licensee does not agree to the terms of this Agreement, Licensee may not install, copy, or otherwise use the Licensed Software. Upon Licensee's acceptance -of the terms and conditions of this Agreement, Digia grants Licensee the -right to use the Licensed Software in the manner provided below. +of the terms and conditions of this Agreement, The Qt Company grants Licensee +the right to use the Licensed Software in the manner provided below. 4. LICENSES 4.1. Using and Copying -Digia grants to Licensee a non-exclusive, non-transferable, time-limited -license to use and copy the Licensed Software for sole purpose of -designing, developing and testing Applications, and evaluating and the +The Qt Company grants to Licensee a non-exclusive, non-transferable, +time-limited license to use and copy the Licensed Software for sole purpose +of designing, developing and testing Applications, and evaluating and the Licensed Software during the Term. Licensee may install copies of the Licensed Software on an unlimited @@ -417,9 +418,9 @@ software statically or dynamically linked with the Licensed Software. 4.3 No Technical Support -Digia has no obligation to furnish Licensee with any technical support -whatsoever. Any such support is subject to separate agreement between -the Parties. +The Qt Company has no obligation to furnish Licensee with any technical +support whatsoever. Any such support is subject to separate agreement +between the Parties. 5. PRE-RELEASE CODE @@ -428,7 +429,7 @@ The Licensed Software contains pre-release code that is not at the level of performance and compatibility of a final, generally available, product offering. The Licensed Software may not operate correctly and may be substantially modified prior to the first commercial product -release, if any. Digia is not obligated to make this or any later +release, if any. The Qt Company is not obligated to make this or any later version of the Licensed Software commercially available. The License Software is "Not for Commercial Use" and may only be used for the purposes described in Section 4. The Licensed Software may not be used @@ -457,8 +458,8 @@ appropriate licensing from such third parties. 7. LIMITED WARRANTY AND WARRANTY DISCLAIMER The Licensed Software is licensed to Licensee "as is". To the maximum -extent permitted by applicable law, Digia on behalf of itself and its -suppliers, disclaims all warranties and conditions, either express or +extent permitted by applicable law, The Qt Company on behalf of itself and +its suppliers, disclaims all warranties and conditions, either express or implied, including, but not limited to, implied warranties of merchantability, fitness for a particular purpose, title and non-infringement with regard to the Licensed Software. @@ -466,21 +467,21 @@ non-infringement with regard to the Licensed Software. 8. LIMITATION OF LIABILITY -If, Digia's warranty disclaimer notwithstanding, Digia is held liable to -Licensee, whether in contract, tort or any other legal theory, based on -the Licensed Software, Digia's entire liability to Licensee and -Licensee's exclusive remedy shall be, at Digia's option, either (A) -return of the price Licensee paid for the Licensed Software, or (B) +If, The Qt Company's warranty disclaimer notwithstanding, The Qt Company is +held liable to Licensee, whether in contract, tort or any other legal theory, +based on the Licensed Software, The Qt Company's entire liability to Licensee +and Licensee's exclusive remedy shall be, at The Qt Company's option, either +(A) return of the price Licensee paid for the Licensed Software, or (B) repair or replacement of the Licensed Software, provided Licensee -returns to Digia all copies of the Licensed Software as originally -delivered to Licensee. Digia shall not under any circumstances be liable -to Licensee based on failure of the Licensed Software if the failure -resulted from accident, abuse or misapplication, nor shall Digia under -any circumstances be liable for special damages, punitive or exemplary +returns to The Qt Company all copies of the Licensed Software as originally +delivered to Licensee. The Qt Company shall not under any circumstances be +liable to Licensee based on failure of the Licensed Software if the failure +resulted from accident, abuse or misapplication, nor shall The Qt Company +under any circumstances be liable for special damages, punitive or exemplary damages, damages for loss of profits or interruption of business or for -loss or corruption of data. Any award of damages from Digia to Licensee -shall not exceed the total amount Licensee has paid to Digia in -connection with this Agreement. +loss or corruption of data. Any award of damages from The Qt Company to +Licensee shall not exceed the total amount Licensee has paid to +The Qt Company in connection with this Agreement. 9. CONFIDENTIALITY @@ -526,7 +527,7 @@ by all legally available means. The obligations of the Receiving Party under this Section shall continue during the Initial Term and for a period of five (5) years after expiration or termination of this Agreement. To the extent that the -terms of the Non-Disclosure Agreement between Digia and Licensee +terms of the Non-Disclosure Agreement between The Qt Company and Licensee conflict with the terms of this Section 9, this Section 9 shall be controlling over the terms of the Non-Disclosure Agreement. @@ -537,18 +538,19 @@ controlling over the terms of the Non-Disclosure Agreement. Licensee shall not be entitled to assign or transfer all or any of its rights, benefits and obligations under this Agreement without the prior -written consent of Digia, which shall not be unreasonably withheld. +written consent of The Qt Company, which shall not be unreasonably withheld. 10.2 Termination -Digia may terminate the Agreement at any time immediately upon written -notice by Digia to Licensee if Licensee breaches this Agreement. +The Qt Company may terminate the Agreement at any time immediately upon +written notice by The Qt Company to Licensee if Licensee breaches this +Agreement. -Upon termination of this Agreement, Licensee shall return to Digia all -copies of Licensed Software that were supplied by Digia. All other -copies of Licensed Software in the possession or control of Licensee +Upon termination of this Agreement, Licensee shall return to The Qt Company +all copies of Licensed Software that were supplied by The Qt Company. All +other copies of Licensed Software in the possession or control of Licensee must be erased or destroyed. An officer of Licensee must promptly -deliver to Digia a written confirmation that this has occurred. +deliver to The Qt Company a written confirmation that this has occurred. 10.3 Surviving Sections @@ -569,8 +571,8 @@ Agreement ("Non-Disclosure Agreement"), if any, shall be subject to Section 9. No modification of this Agreement shall be effective unless contained in a writing executed by an authorized representative of each party. No term or condition contained in Licensee's purchase order shall -apply unless expressly accepted by Digia in writing. If any provision of -the Agreement is found void or unenforceable, the remainder shall remain +apply unless expressly accepted by The Qt Company in writing. If any provision +of the Agreement is found void or unenforceable, the remainder shall remain valid and enforceable according to its terms. If any remedy provided is determined to have failed for its essential purpose, all limitations of liability and exclusions of damages set forth in this Agreement shall @@ -603,9 +605,9 @@ process shall be conducted in the English language. There are no implied licenses or other implied rights granted under this Agreement, and all rights, save for those expressly granted hereunder, -shall remain with Digia and its licensors. In addition, no licenses or -immunities are granted to the combination of the Licensed Software with -any other software or hardware not delivered by Digia under this +shall remain with The Qt Company and its licensors. In addition, no licenses +or immunities are granted to the combination of the Licensed Software with +any other software or hardware not delivered by The Qt Company under this Agreement. 10.8 Government End Users diff --git a/bin/fixqt4headers.pl b/bin/fixqt4headers.pl index 653c1ae8c1..d39f5f3ec8 100755 --- a/bin/fixqt4headers.pl +++ b/bin/fixqt4headers.pl @@ -1,41 +1,33 @@ #!/usr/bin/env perl ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -## Contact: http://www.qt-project.org/legal +## Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies). +## Contact: http://www.qt.io/licensing/ ## ## This file is part of the porting tools of the Qt Toolkit. ## -## $QT_BEGIN_LICENSE:LGPL$ +## $QT_BEGIN_LICENSE:LGPL21$ ## 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 Digia. For licensing terms and -## conditions see http://qt.digia.com/licensing. For further information -## use the contact form at http://qt.digia.com/contact-us. +## 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 as published by the Free Software -## Foundation and appearing in the file LICENSE.LGPL included in the -## packaging of this file. Please review the following information to -## ensure the GNU Lesser General Public License version 2.1 requirements -## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## 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. ## -## In addition, as a special exception, Digia gives you certain additional -## rights. These rights are described in the Digia Qt LGPL Exception +## 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. ## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3.0 as published by the Free Software -## Foundation and appearing in the file LICENSE.GPL included in the -## packaging of this file. Please review the following information to -## ensure the GNU General Public License version 3.0 requirements will be -## met: http://www.gnu.org/copyleft/gpl.html. -## -## ## $QT_END_LICENSE$ ## ############################################################################# diff --git a/bin/syncqt.pl b/bin/syncqt.pl index 3780c9f422..4462cebe4e 100755 --- a/bin/syncqt.pl +++ b/bin/syncqt.pl @@ -1,41 +1,33 @@ #!/usr/bin/env perl ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -## Contact: http://www.qt-project.org/legal +## Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies). +## Contact: http://www.qt.io/licensing/ ## ## This file is part of the build configuration tools of the Qt Toolkit. ## -## $QT_BEGIN_LICENSE:LGPL$ +## $QT_BEGIN_LICENSE:LGPL21$ ## 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 Digia. For licensing terms and -## conditions see http://qt.digia.com/licensing. For further information -## use the contact form at http://qt.digia.com/contact-us. +## 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 as published by the Free Software -## Foundation and appearing in the file LICENSE.LGPL included in the -## packaging of this file. Please review the following information to -## ensure the GNU Lesser General Public License version 2.1 requirements -## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## 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. ## -## In addition, as a special exception, Digia gives you certain additional -## rights. These rights are described in the Digia Qt LGPL Exception +## 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. ## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3.0 as published by the Free Software -## Foundation and appearing in the file LICENSE.GPL included in the -## packaging of this file. Please review the following information to -## ensure the GNU General Public License version 3.0 requirements will be -## met: http://www.gnu.org/copyleft/gpl.html. -## -## ## $QT_END_LICENSE$ ## ############################################################################# diff --git a/config.tests/arch/arch.cpp b/config.tests/arch/arch.cpp index d9e9f47b35..854228cc9c 100644 --- a/config.tests/arch/arch.cpp +++ b/config.tests/arch/arch.cpp @@ -1,8 +1,8 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2015 The Qt Company Ltd. ** Copyright (C) 2012 Intel Corporation -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the FOO module of the Qt Toolkit. ** @@ -11,9 +11,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -24,8 +24,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/common/avx/avx.cpp b/config.tests/common/avx/avx.cpp index b1fa969de8..4a59e1f56e 100644 --- a/config.tests/common/avx/avx.cpp +++ b/config.tests/common/avx/avx.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/common/avx2/avx2.cpp b/config.tests/common/avx2/avx2.cpp index c75e129dba..17ca229b2b 100644 --- a/config.tests/common/avx2/avx2.cpp +++ b/config.tests/common/avx2/avx2.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2012 Intel Corporation. -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the configuration of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/common/c++11/c++11.cpp b/config.tests/common/c++11/c++11.cpp index f2eb1d7d17..7e80723470 100644 --- a/config.tests/common/c++11/c++11.cpp +++ b/config.tests/common/c++11/c++11.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the FOO module of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/common/libproxy/libproxy.cpp b/config.tests/common/libproxy/libproxy.cpp index cd366f52ee..f3335968a8 100644 --- a/config.tests/common/libproxy/libproxy.cpp +++ b/config.tests/common/libproxy/libproxy.cpp @@ -1,40 +1,32 @@ /**************************************************************************** ** -** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL$ +** $QT_BEGIN_LICENSE:LGPL21$ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/config.tests/common/sse2/sse2.cpp b/config.tests/common/sse2/sse2.cpp index e1ea65ae46..28366aaf65 100644 --- a/config.tests/common/sse2/sse2.cpp +++ b/config.tests/common/sse2/sse2.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/common/sse3/sse3.cpp b/config.tests/common/sse3/sse3.cpp index 30e67ad84f..45cea18519 100644 --- a/config.tests/common/sse3/sse3.cpp +++ b/config.tests/common/sse3/sse3.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/common/sse4_1/sse4_1.cpp b/config.tests/common/sse4_1/sse4_1.cpp index f7f06e63dc..3f32143624 100644 --- a/config.tests/common/sse4_1/sse4_1.cpp +++ b/config.tests/common/sse4_1/sse4_1.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/common/sse4_2/sse4_2.cpp b/config.tests/common/sse4_2/sse4_2.cpp index 77e8bb4404..3a0d084a60 100644 --- a/config.tests/common/sse4_2/sse4_2.cpp +++ b/config.tests/common/sse4_2/sse4_2.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/common/ssse3/ssse3.cpp b/config.tests/common/ssse3/ssse3.cpp index 99631c14a3..1ddea784be 100644 --- a/config.tests/common/ssse3/ssse3.cpp +++ b/config.tests/common/ssse3/ssse3.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/mac/corewlan/corewlantest.mm b/config.tests/mac/corewlan/corewlantest.mm index 02c609a466..bcc3be94e1 100644 --- a/config.tests/mac/corewlan/corewlantest.mm +++ b/config.tests/mac/corewlan/corewlantest.mm @@ -1,40 +1,32 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies). +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL$ +** $QT_BEGIN_LICENSE:LGPL21$ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/config.tests/qpa/direct2d/direct2d.cpp b/config.tests/qpa/direct2d/direct2d.cpp index 1cb239408d..2274c8c6b5 100644 --- a/config.tests/qpa/direct2d/direct2d.cpp +++ b/config.tests/qpa/direct2d/direct2d.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/qpa/directfb/directfb.cpp b/config.tests/qpa/directfb/directfb.cpp index 49ce228425..85fbbd5379 100644 --- a/config.tests/qpa/directfb/directfb.cpp +++ b/config.tests/qpa/directfb/directfb.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2012 Intel Corporation -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/qpa/egl-x11/egl-x11.cpp b/config.tests/qpa/egl-x11/egl-x11.cpp index c95a821e14..8753b69222 100644 --- a/config.tests/qpa/egl-x11/egl-x11.cpp +++ b/config.tests/qpa/egl-x11/egl-x11.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/qpa/egl/egl.cpp b/config.tests/qpa/egl/egl.cpp index 1693c1a91d..5111f23b07 100644 --- a/config.tests/qpa/egl/egl.cpp +++ b/config.tests/qpa/egl/egl.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/qpa/kms/kms.cpp b/config.tests/qpa/kms/kms.cpp index 1854bc1045..64c11158c5 100644 --- a/config.tests/qpa/kms/kms.cpp +++ b/config.tests/qpa/kms/kms.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/qpa/linuxfb/linuxfb.cpp b/config.tests/qpa/linuxfb/linuxfb.cpp index 9a54550027..66216e10d1 100644 --- a/config.tests/qpa/linuxfb/linuxfb.cpp +++ b/config.tests/qpa/linuxfb/linuxfb.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/qpa/xcb-glx/xcb-glx.cpp b/config.tests/qpa/xcb-glx/xcb-glx.cpp index 946f5dd772..b2213ed391 100644 --- a/config.tests/qpa/xcb-glx/xcb-glx.cpp +++ b/config.tests/qpa/xcb-glx/xcb-glx.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/qpa/xcb-render/xcb-render.cpp b/config.tests/qpa/xcb-render/xcb-render.cpp index 27d02157e8..751dfcb157 100644 --- a/config.tests/qpa/xcb-render/xcb-render.cpp +++ b/config.tests/qpa/xcb-render/xcb-render.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/qpa/xcb-syslibs/xcb.cpp b/config.tests/qpa/xcb-syslibs/xcb.cpp index 827c27b9f8..deec79c84c 100644 --- a/config.tests/qpa/xcb-syslibs/xcb.cpp +++ b/config.tests/qpa/xcb-syslibs/xcb.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/qpa/xcb-xkb/xcb-xkb.cpp b/config.tests/qpa/xcb-xkb/xcb-xkb.cpp index 2fb8b3ab07..27022719d3 100644 --- a/config.tests/qpa/xcb-xkb/xcb-xkb.cpp +++ b/config.tests/qpa/xcb-xkb/xcb-xkb.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/qpa/xcb-xlib/xcb-xlib.cpp b/config.tests/qpa/xcb-xlib/xcb-xlib.cpp index 51c472a5aa..d1334fb2be 100644 --- a/config.tests/qpa/xcb-xlib/xcb-xlib.cpp +++ b/config.tests/qpa/xcb-xlib/xcb-xlib.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/qpa/xcb/xcb.cpp b/config.tests/qpa/xcb/xcb.cpp index 564e4b1ca4..04c43b0919 100644 --- a/config.tests/qpa/xcb/xcb.cpp +++ b/config.tests/qpa/xcb/xcb.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/alsa/alsatest.cpp b/config.tests/unix/alsa/alsatest.cpp index 3ca13d6b69..cab6533977 100644 --- a/config.tests/unix/alsa/alsatest.cpp +++ b/config.tests/unix/alsa/alsatest.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/clock-gettime/clock-gettime.cpp b/config.tests/unix/clock-gettime/clock-gettime.cpp index e8644e1bff..4ba05f70f5 100644 --- a/config.tests/unix/clock-gettime/clock-gettime.cpp +++ b/config.tests/unix/clock-gettime/clock-gettime.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/clock-monotonic/clock-monotonic.cpp b/config.tests/unix/clock-monotonic/clock-monotonic.cpp index 0703b59159..073508a87c 100644 --- a/config.tests/unix/clock-monotonic/clock-monotonic.cpp +++ b/config.tests/unix/clock-monotonic/clock-monotonic.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/cups/cups.cpp b/config.tests/unix/cups/cups.cpp index 00ff65c1e8..9ebdb60872 100644 --- a/config.tests/unix/cups/cups.cpp +++ b/config.tests/unix/cups/cups.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/db2/db2.cpp b/config.tests/unix/db2/db2.cpp index ec9fbf2217..114bf2fc28 100644 --- a/config.tests/unix/db2/db2.cpp +++ b/config.tests/unix/db2/db2.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/dbus/dbus.cpp b/config.tests/unix/dbus/dbus.cpp index 8156f5c6b0..8b8a10de93 100644 --- a/config.tests/unix/dbus/dbus.cpp +++ b/config.tests/unix/dbus/dbus.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/evdev/evdev.cpp b/config.tests/unix/evdev/evdev.cpp index cd1caf39ad..5174acf3aa 100644 --- a/config.tests/unix/evdev/evdev.cpp +++ b/config.tests/unix/evdev/evdev.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/eventfd/main.cpp b/config.tests/unix/eventfd/main.cpp index c7c292f51d..abc3d3340a 100644 --- a/config.tests/unix/eventfd/main.cpp +++ b/config.tests/unix/eventfd/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2012 Intel Corporation -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/floatmath/floatmath.cpp b/config.tests/unix/floatmath/floatmath.cpp index c8540c6d1d..4becf2a266 100644 --- a/config.tests/unix/floatmath/floatmath.cpp +++ b/config.tests/unix/floatmath/floatmath.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/fontconfig/fontconfig.cpp b/config.tests/unix/fontconfig/fontconfig.cpp index 9348214899..b720ebdc9c 100644 --- a/config.tests/unix/fontconfig/fontconfig.cpp +++ b/config.tests/unix/fontconfig/fontconfig.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/freetype/freetype.cpp b/config.tests/unix/freetype/freetype.cpp index 210bd67468..df686cc33c 100644 --- a/config.tests/unix/freetype/freetype.cpp +++ b/config.tests/unix/freetype/freetype.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/getaddrinfo/getaddrinfotest.cpp b/config.tests/unix/getaddrinfo/getaddrinfotest.cpp index 7a54b3e2a7..6cb00dc661 100644 --- a/config.tests/unix/getaddrinfo/getaddrinfotest.cpp +++ b/config.tests/unix/getaddrinfo/getaddrinfotest.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/getifaddrs/getifaddrs.cpp b/config.tests/unix/getifaddrs/getifaddrs.cpp index f21ec7b6e8..ebc0eda803 100644 --- a/config.tests/unix/getifaddrs/getifaddrs.cpp +++ b/config.tests/unix/getifaddrs/getifaddrs.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/glib/glib.cpp b/config.tests/unix/glib/glib.cpp index f8abc824c6..dc3392c86f 100644 --- a/config.tests/unix/glib/glib.cpp +++ b/config.tests/unix/glib/glib.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/gnu-libiconv/gnu-libiconv.cpp b/config.tests/unix/gnu-libiconv/gnu-libiconv.cpp index 04b475241f..d11ed90dbc 100644 --- a/config.tests/unix/gnu-libiconv/gnu-libiconv.cpp +++ b/config.tests/unix/gnu-libiconv/gnu-libiconv.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/harfbuzz/harfbuzz.cpp b/config.tests/unix/harfbuzz/harfbuzz.cpp index 09df88f664..bbaa9fc14d 100644 --- a/config.tests/unix/harfbuzz/harfbuzz.cpp +++ b/config.tests/unix/harfbuzz/harfbuzz.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/ibase/ibase.cpp b/config.tests/unix/ibase/ibase.cpp index 0b2c7463ce..85ce3027da 100644 --- a/config.tests/unix/ibase/ibase.cpp +++ b/config.tests/unix/ibase/ibase.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/iconv/iconv.cpp b/config.tests/unix/iconv/iconv.cpp index b15b4174c5..298578a61e 100644 --- a/config.tests/unix/iconv/iconv.cpp +++ b/config.tests/unix/iconv/iconv.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/icu/icu.cpp b/config.tests/unix/icu/icu.cpp index a663239b98..c1e6c6afa0 100644 --- a/config.tests/unix/icu/icu.cpp +++ b/config.tests/unix/icu/icu.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/inotify/inotifytest.cpp b/config.tests/unix/inotify/inotifytest.cpp index 81f3eca08f..57c6dd11bf 100644 --- a/config.tests/unix/inotify/inotifytest.cpp +++ b/config.tests/unix/inotify/inotifytest.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/iodbc/iodbc.cpp b/config.tests/unix/iodbc/iodbc.cpp index eb990034f9..27689a57bb 100644 --- a/config.tests/unix/iodbc/iodbc.cpp +++ b/config.tests/unix/iodbc/iodbc.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/ipc_posix/ipc.cpp b/config.tests/unix/ipc_posix/ipc.cpp index cdb3b9afba..ea5af37b71 100644 --- a/config.tests/unix/ipc_posix/ipc.cpp +++ b/config.tests/unix/ipc_posix/ipc.cpp @@ -1,40 +1,32 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies). +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL$ +** $QT_BEGIN_LICENSE:LGPL21$ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/config.tests/unix/ipc_sysv/ipc.cpp b/config.tests/unix/ipc_sysv/ipc.cpp index 751354d1ff..94a907c1d8 100644 --- a/config.tests/unix/ipc_sysv/ipc.cpp +++ b/config.tests/unix/ipc_sysv/ipc.cpp @@ -1,40 +1,32 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies). +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL$ +** $QT_BEGIN_LICENSE:LGPL21$ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/config.tests/unix/ipv6ifname/ipv6ifname.cpp b/config.tests/unix/ipv6ifname/ipv6ifname.cpp index 951ce48195..709dc29307 100644 --- a/config.tests/unix/ipv6ifname/ipv6ifname.cpp +++ b/config.tests/unix/ipv6ifname/ipv6ifname.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/javascriptcore-jit/hwcap_test.cpp b/config.tests/unix/javascriptcore-jit/hwcap_test.cpp index 74b0d97bed..ef65a1cda2 100644 --- a/config.tests/unix/javascriptcore-jit/hwcap_test.cpp +++ b/config.tests/unix/javascriptcore-jit/hwcap_test.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/journald/journald.c b/config.tests/unix/journald/journald.c index 3139672d21..76eeb3dfac 100644 --- a/config.tests/unix/journald/journald.c +++ b/config.tests/unix/journald/journald.c @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2014 Jolla Ltd, author: -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/lgmon/lgmon.cpp b/config.tests/unix/lgmon/lgmon.cpp index 687caa0213..8769cc5d27 100644 --- a/config.tests/unix/lgmon/lgmon.cpp +++ b/config.tests/unix/lgmon/lgmon.cpp @@ -1,7 +1,7 @@ /*************************************************************************** ** ** Copyright (C) 2014 BlackBerry Limited. All rights reserved. -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/libinput/libinput.cpp b/config.tests/unix/libinput/libinput.cpp index 0eb6a0f2d4..857df96671 100644 --- a/config.tests/unix/libinput/libinput.cpp +++ b/config.tests/unix/libinput/libinput.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/libjpeg/libjpeg.cpp b/config.tests/unix/libjpeg/libjpeg.cpp index abd8906ff0..68c11e1335 100644 --- a/config.tests/unix/libjpeg/libjpeg.cpp +++ b/config.tests/unix/libjpeg/libjpeg.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/libpng/libpng.cpp b/config.tests/unix/libpng/libpng.cpp index 971f6cda03..f9fb396af5 100644 --- a/config.tests/unix/libpng/libpng.cpp +++ b/config.tests/unix/libpng/libpng.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/libudev/libudev.cpp b/config.tests/unix/libudev/libudev.cpp index 7566824cee..c6e39cd578 100644 --- a/config.tests/unix/libudev/libudev.cpp +++ b/config.tests/unix/libudev/libudev.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/mips_dsp/mips_dsp.cpp b/config.tests/unix/mips_dsp/mips_dsp.cpp index 61b9ba393c..886e7b93c1 100644 --- a/config.tests/unix/mips_dsp/mips_dsp.cpp +++ b/config.tests/unix/mips_dsp/mips_dsp.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/mips_dspr2/mips_dspr2.cpp b/config.tests/unix/mips_dspr2/mips_dspr2.cpp index 07844db0c0..e61c2f0cb6 100644 --- a/config.tests/unix/mips_dspr2/mips_dspr2.cpp +++ b/config.tests/unix/mips_dspr2/mips_dspr2.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/mremap/mremap.cpp b/config.tests/unix/mremap/mremap.cpp index 9eff358656..ea17449bc7 100644 --- a/config.tests/unix/mremap/mremap.cpp +++ b/config.tests/unix/mremap/mremap.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/mtdev/mtdev.cpp b/config.tests/unix/mtdev/mtdev.cpp index 7faade9bda..4cabdb28e8 100644 --- a/config.tests/unix/mtdev/mtdev.cpp +++ b/config.tests/unix/mtdev/mtdev.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Jolla Ltd, author: -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/mysql/mysql.cpp b/config.tests/unix/mysql/mysql.cpp index f5f75a6fe4..9cc2db03d9 100644 --- a/config.tests/unix/mysql/mysql.cpp +++ b/config.tests/unix/mysql/mysql.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/nis/nis.cpp b/config.tests/unix/nis/nis.cpp index 45d73e2509..f2d7f223e3 100644 --- a/config.tests/unix/nis/nis.cpp +++ b/config.tests/unix/nis/nis.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/objcopy/objcopy.cpp b/config.tests/unix/objcopy/objcopy.cpp index 594c88153e..7f90e6b3fd 100644 --- a/config.tests/unix/objcopy/objcopy.cpp +++ b/config.tests/unix/objcopy/objcopy.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2014 BlackBerry Limited. All rights reserved. -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/oci/oci.cpp b/config.tests/unix/oci/oci.cpp index 2998311459..4dbb3226d0 100644 --- a/config.tests/unix/oci/oci.cpp +++ b/config.tests/unix/oci/oci.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/odbc/odbc.cpp b/config.tests/unix/odbc/odbc.cpp index c4ef430bb6..6fe3ec6ad6 100644 --- a/config.tests/unix/odbc/odbc.cpp +++ b/config.tests/unix/odbc/odbc.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/opengldesktop/opengldesktop.cpp b/config.tests/unix/opengldesktop/opengldesktop.cpp index 8e995ea87f..13e3059364 100644 --- a/config.tests/unix/opengldesktop/opengldesktop.cpp +++ b/config.tests/unix/opengldesktop/opengldesktop.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/opengles2/opengles2.cpp b/config.tests/unix/opengles2/opengles2.cpp index 06614cb806..b3b9be6d49 100644 --- a/config.tests/unix/opengles2/opengles2.cpp +++ b/config.tests/unix/opengles2/opengles2.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/opengles3/opengles3.cpp b/config.tests/unix/opengles3/opengles3.cpp index 9fc572a1b2..506ac8b19c 100644 --- a/config.tests/unix/opengles3/opengles3.cpp +++ b/config.tests/unix/opengles3/opengles3.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/opengles31/opengles31.cpp b/config.tests/unix/opengles31/opengles31.cpp index a63542db70..b56e29b5d7 100644 --- a/config.tests/unix/opengles31/opengles31.cpp +++ b/config.tests/unix/opengles31/opengles31.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/openssl/openssl.cpp b/config.tests/unix/openssl/openssl.cpp index 68cfc0542d..6282bfa328 100644 --- a/config.tests/unix/openssl/openssl.cpp +++ b/config.tests/unix/openssl/openssl.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/openvg/openvg.cpp b/config.tests/unix/openvg/openvg.cpp index 4f6b52fec1..1fbaa004e7 100644 --- a/config.tests/unix/openvg/openvg.cpp +++ b/config.tests/unix/openvg/openvg.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/pcre/pcre.cpp b/config.tests/unix/pcre/pcre.cpp index a881e1cfc9..f68584a0dc 100644 --- a/config.tests/unix/pcre/pcre.cpp +++ b/config.tests/unix/pcre/pcre.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2012 Giuseppe D'Angelo . -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/posix_fallocate/posix_fallocate.cpp b/config.tests/unix/posix_fallocate/posix_fallocate.cpp index 07cf69834a..689feb6870 100644 --- a/config.tests/unix/posix_fallocate/posix_fallocate.cpp +++ b/config.tests/unix/posix_fallocate/posix_fallocate.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/pps/pps.cpp b/config.tests/unix/pps/pps.cpp index 5b799de3bd..b1c7d3c8bc 100644 --- a/config.tests/unix/pps/pps.cpp +++ b/config.tests/unix/pps/pps.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 BlackBerry Limited. All rights reserved. -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/psql/psql.cpp b/config.tests/unix/psql/psql.cpp index 5d56996b77..2e1e698eb3 100644 --- a/config.tests/unix/psql/psql.cpp +++ b/config.tests/unix/psql/psql.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/ptrsize/ptrsizetest.cpp b/config.tests/unix/ptrsize/ptrsizetest.cpp index 07734a0c2f..826095d0e9 100644 --- a/config.tests/unix/ptrsize/ptrsizetest.cpp +++ b/config.tests/unix/ptrsize/ptrsizetest.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/pulseaudio/pulseaudio.cpp b/config.tests/unix/pulseaudio/pulseaudio.cpp index 4371ffed58..4e56cffcb2 100644 --- a/config.tests/unix/pulseaudio/pulseaudio.cpp +++ b/config.tests/unix/pulseaudio/pulseaudio.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/qqnx_imf/qqnx_imf.cpp b/config.tests/unix/qqnx_imf/qqnx_imf.cpp index 8c5da90f4a..5ebadad1b8 100644 --- a/config.tests/unix/qqnx_imf/qqnx_imf.cpp +++ b/config.tests/unix/qqnx_imf/qqnx_imf.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 BlackBerry Limited. All rights reserved. -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/shivavg/shivavg.cpp b/config.tests/unix/shivavg/shivavg.cpp index f36bc9cc56..614061db9d 100644 --- a/config.tests/unix/shivavg/shivavg.cpp +++ b/config.tests/unix/shivavg/shivavg.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/slog2/slog2.cpp b/config.tests/unix/slog2/slog2.cpp index c729d92cb9..8e13409a02 100644 --- a/config.tests/unix/slog2/slog2.cpp +++ b/config.tests/unix/slog2/slog2.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2011 - 2012 Research In Motion -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/sqlite/sqlite.cpp b/config.tests/unix/sqlite/sqlite.cpp index 56e6ff02eb..b639e82ed8 100644 --- a/config.tests/unix/sqlite/sqlite.cpp +++ b/config.tests/unix/sqlite/sqlite.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/sqlite2/sqlite2.cpp b/config.tests/unix/sqlite2/sqlite2.cpp index afd998a6c3..1273ad5979 100644 --- a/config.tests/unix/sqlite2/sqlite2.cpp +++ b/config.tests/unix/sqlite2/sqlite2.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/stdint/main.cpp b/config.tests/unix/stdint/main.cpp index 50d10ba5f7..f54bb7c93b 100644 --- a/config.tests/unix/stdint/main.cpp +++ b/config.tests/unix/stdint/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/stl/stltest.cpp b/config.tests/unix/stl/stltest.cpp index 3a35e220c8..6c6a51b797 100644 --- a/config.tests/unix/stl/stltest.cpp +++ b/config.tests/unix/stl/stltest.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/tds/tds.cpp b/config.tests/unix/tds/tds.cpp index 1173e47ca4..af4dc5a47e 100644 --- a/config.tests/unix/tds/tds.cpp +++ b/config.tests/unix/tds/tds.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/tslib/tslib.cpp b/config.tests/unix/tslib/tslib.cpp index 9a9600b968..3e210c0e2f 100644 --- a/config.tests/unix/tslib/tslib.cpp +++ b/config.tests/unix/tslib/tslib.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/xkbcommon/xkbcommon.cpp b/config.tests/unix/xkbcommon/xkbcommon.cpp index 4d50ebc363..61bacacd85 100644 --- a/config.tests/unix/xkbcommon/xkbcommon.cpp +++ b/config.tests/unix/xkbcommon/xkbcommon.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/unix/zlib/zlib.cpp b/config.tests/unix/zlib/zlib.cpp index b8d5c26f1f..be01ab3c62 100644 --- a/config.tests/unix/zlib/zlib.cpp +++ b/config.tests/unix/zlib/zlib.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/x11/glxfbconfig/glxfbconfig.cpp b/config.tests/x11/glxfbconfig/glxfbconfig.cpp index 109c07b6c3..fd13831a20 100644 --- a/config.tests/x11/glxfbconfig/glxfbconfig.cpp +++ b/config.tests/x11/glxfbconfig/glxfbconfig.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/x11/mitshm/mitshm.cpp b/config.tests/x11/mitshm/mitshm.cpp index 2a019d1919..1d21717083 100644 --- a/config.tests/x11/mitshm/mitshm.cpp +++ b/config.tests/x11/mitshm/mitshm.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/x11/notype/notypetest.cpp b/config.tests/x11/notype/notypetest.cpp index bb2e9185d3..405ebd5aad 100644 --- a/config.tests/x11/notype/notypetest.cpp +++ b/config.tests/x11/notype/notypetest.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/x11/opengl/opengl.cpp b/config.tests/x11/opengl/opengl.cpp index 2e70f2fcef..e325a60a16 100644 --- a/config.tests/x11/opengl/opengl.cpp +++ b/config.tests/x11/opengl/opengl.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/x11/xcursor/xcursor.cpp b/config.tests/x11/xcursor/xcursor.cpp index af011d871f..5e5509e158 100644 --- a/config.tests/x11/xcursor/xcursor.cpp +++ b/config.tests/x11/xcursor/xcursor.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/x11/xfixes/xfixes.cpp b/config.tests/x11/xfixes/xfixes.cpp index f07d2e2cb3..cdc25acfd7 100644 --- a/config.tests/x11/xfixes/xfixes.cpp +++ b/config.tests/x11/xfixes/xfixes.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/x11/xinerama/xinerama.cpp b/config.tests/x11/xinerama/xinerama.cpp index fbd95ef7c5..c795791806 100644 --- a/config.tests/x11/xinerama/xinerama.cpp +++ b/config.tests/x11/xinerama/xinerama.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/x11/xinput/xinput.cpp b/config.tests/x11/xinput/xinput.cpp index 7ff9d465d7..1d717c0125 100644 --- a/config.tests/x11/xinput/xinput.cpp +++ b/config.tests/x11/xinput/xinput.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/x11/xinput2/xinput2.cpp b/config.tests/x11/xinput2/xinput2.cpp index 76f31dc7d3..d7f38d2ab2 100644 --- a/config.tests/x11/xinput2/xinput2.cpp +++ b/config.tests/x11/xinput2/xinput2.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/x11/xkb/xkb.cpp b/config.tests/x11/xkb/xkb.cpp index 4af4515d1e..a85e38c6ec 100644 --- a/config.tests/x11/xkb/xkb.cpp +++ b/config.tests/x11/xkb/xkb.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/x11/xlib/xlib.cpp b/config.tests/x11/xlib/xlib.cpp index b27d551199..e0f7201ee4 100644 --- a/config.tests/x11/xlib/xlib.cpp +++ b/config.tests/x11/xlib/xlib.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/x11/xrandr/xrandr.cpp b/config.tests/x11/xrandr/xrandr.cpp index b33c78e522..39ef0a19f5 100644 --- a/config.tests/x11/xrandr/xrandr.cpp +++ b/config.tests/x11/xrandr/xrandr.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/x11/xrender/xrender.cpp b/config.tests/x11/xrender/xrender.cpp index 0933e61817..d9f01e8f1a 100644 --- a/config.tests/x11/xrender/xrender.cpp +++ b/config.tests/x11/xrender/xrender.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/x11/xshape/xshape.cpp b/config.tests/x11/xshape/xshape.cpp index f6ad1b9aa4..91eb0c1a8f 100644 --- a/config.tests/x11/xshape/xshape.cpp +++ b/config.tests/x11/xshape/xshape.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/x11/xsync/xsync.cpp b/config.tests/x11/xsync/xsync.cpp index b9d077295e..bae5f4c233 100644 --- a/config.tests/x11/xsync/xsync.cpp +++ b/config.tests/x11/xsync/xsync.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/config.tests/x11/xvideo/xvideo.cpp b/config.tests/x11/xvideo/xvideo.cpp index 8923a2ade4..087e42530e 100644 --- a/config.tests/x11/xvideo/xvideo.cpp +++ b/config.tests/x11/xvideo/xvideo.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the FOO module of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/configure b/configure index 835cb9e58f..47a290992c 100755 --- a/configure +++ b/configure @@ -1,9 +1,9 @@ #!/bin/sh ############################################################################# ## -## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2015 The Qt Company Ltd. ## Copyright (C) 2013 Intel Corporation. -## Contact: http://www.qt-project.org/legal +## Contact: http://www.qt.io/licensing/ ## ## This file is the build configuration utility of the Qt Toolkit. ## @@ -12,9 +12,9 @@ ## 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 Digia. For licensing terms and -## conditions see http://qt.digia.com/licensing. For further information -## use the contact form at http://qt.digia.com/contact-us. +## 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 @@ -25,8 +25,8 @@ ## requirements will be met: https://www.gnu.org/licenses/lgpl.html and ## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ## -## In addition, as a special exception, Digia gives you certain additional -## rights. These rights are described in the Digia Qt LGPL Exception +## 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. ## ## $QT_END_LICENSE$ @@ -2919,7 +2919,7 @@ elif [ $COMMERCIAL_USER = "yes" ]; then echo echo "Error: This is the Open Source version of Qt." echo "If you want to use Enterprise features of Qt," - echo "use the contact form at http://qt.digia.com/contact-us" + echo "information use the contact form at http://www.qt.io/contact-us" echo "to purchase a license." echo exit 1 @@ -3168,7 +3168,7 @@ if [ '!' -f "${XQMAKESPEC}/qplatformdefs.h" ]; then echo echo " $XQMAKESPEC/qplatformdefs.h" echo - echo " Please use the contact form at http://qt.digia.com/contact-us" + echo " Please information use the contact form at http://www.qt.io/contact-us" echo exit 2 fi diff --git a/configure.bat b/configure.bat index ae42248f12..6852ec7146 100644 --- a/configure.bat +++ b/configure.bat @@ -1,7 +1,7 @@ ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: :: -:: Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -:: Contact: http://www.qt-project.org/legal +:: Copyright (C) 2015 The Qt Company Ltd. +:: Contact: http://www.qt.io/licensing/ :: :: This file is part of the tools applications of the Qt Toolkit. :: @@ -10,9 +10,9 @@ :: 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 Digia. For licensing terms and -:: conditions see http://qt.digia.com/licensing. For further information -:: use the contact form at http://qt.digia.com/contact-us. +:: 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 @@ -23,8 +23,8 @@ :: requirements will be met: https://www.gnu.org/licenses/lgpl.html and :: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. :: -:: In addition, as a special exception, Digia gives you certain additional -:: rights. These rights are described in the Digia Qt LGPL Exception +:: 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. :: :: $QT_END_LICENSE$ diff --git a/doc/global/config.qdocconf b/doc/global/config.qdocconf index 51bd7b4f96..35e7535824 100644 --- a/doc/global/config.qdocconf +++ b/doc/global/config.qdocconf @@ -4,7 +4,7 @@ dita.metadata.default.author = Qt Project dita.metadata.default.permissions = all dita.metadata.default.publisher = Qt Project dita.metadata.default.copyryear = 2015 -dita.metadata.default.copyrholder = Digia Plc +dita.metadata.default.copyrholder = The Qt Company Ltd dita.metadata.default.audience = programmer #Set the main Qt index.html diff --git a/doc/global/externalsites/external-resources.qdoc b/doc/global/externalsites/external-resources.qdoc index a7aaedfe5b..96ff35aee4 100644 --- a/doc/global/externalsites/external-resources.qdoc +++ b/doc/global/externalsites/external-resources.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/doc/global/externalsites/qt-webpages.qdoc b/doc/global/externalsites/qt-webpages.qdoc index db946b41da..870dd01923 100644 --- a/doc/global/externalsites/qt-webpages.qdoc +++ b/doc/global/externalsites/qt-webpages.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/doc/global/externalsites/qtcreator.qdoc b/doc/global/externalsites/qtcreator.qdoc index c96920a689..200ef307ca 100644 --- a/doc/global/externalsites/qtcreator.qdoc +++ b/doc/global/externalsites/qtcreator.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/doc/global/externalsites/rfc.qdoc b/doc/global/externalsites/rfc.qdoc index 37c71ab73e..a12363da7c 100644 --- a/doc/global/externalsites/rfc.qdoc +++ b/doc/global/externalsites/rfc.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/doc/global/html-footer.qdocconf b/doc/global/html-footer.qdocconf index 217494575f..0a35e14ead 100644 --- a/doc/global/html-footer.qdocconf +++ b/doc/global/html-footer.qdocconf @@ -8,13 +8,13 @@ HTML.footer = \ "\n" \ "
\n" \ "

\n" \ - " © 2015 Digia Plc and/or its\n" \ - " subsidiaries. Documentation contributions included herein are the copyrights of\n" \ + " © 2015 The Qt Company Ltd\n" \ + " Documentation contributions included herein are the copyrights of\n" \ " their respective owners.
" \ " The documentation provided herein is licensed under the terms of the" \ " GNU Free Documentation" \ " License version 1.3 as published by the Free Software Foundation.
" \ - " Digia, Qt and their respective logos are trademarks of Digia Plc " \ + " The Qt Company, Qt and their respective logos are trademarks of The Qt Company Ltd " \ " in Finland and/or other countries worldwide. All other trademarks are property\n" \ " of their respective owners.

\n" \ "
\n" \ diff --git a/doc/global/includes-online/search.qdoc b/doc/global/includes-online/search.qdoc index 25c4563df6..170848286e 100644 --- a/doc/global/includes-online/search.qdoc +++ b/doc/global/includes-online/search.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/doc/global/qt-module-defaults-online.qdocconf b/doc/global/qt-module-defaults-online.qdocconf index 6e6854ff82..4cbd736097 100644 --- a/doc/global/qt-module-defaults-online.qdocconf +++ b/doc/global/qt-module-defaults-online.qdocconf @@ -5,13 +5,13 @@ HTML.footer = \ " \n" \ "

\n" \ - " © 2015 Digia Plc and/or its\n" \ - " subsidiaries. Documentation contributions included herein are the copyrights of\n" \ + " © 2015 The Qt Company Ltd.\n" \ + " Documentation contributions included herein are the copyrights of\n" \ " their respective owners. " \ " The documentation provided herein is licensed under the terms of the" \ " GNU Free Documentation" \ " License version 1.3 as published by the Free Software Foundation. " \ - " Digia, Qt and their respective logos are trademarks of Digia Plc " \ + " The Qt Company, Qt and their respective logos are trademarks of The Qt Company Ltd " \ " in Finland and/or other countries worldwide. All other trademarks are property\n" \ " of their respective owners.

\n" diff --git a/doc/src/examples/bearermonitor.qdoc b/doc/src/examples/bearermonitor.qdoc index d82fb851c2..c862fd3271 100644 --- a/doc/src/examples/bearermonitor.qdoc +++ b/doc/src/examples/bearermonitor.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/doc/src/examples/complexpingpong.qdoc b/doc/src/examples/complexpingpong.qdoc index aba1d4d961..29faa370d5 100644 --- a/doc/src/examples/complexpingpong.qdoc +++ b/doc/src/examples/complexpingpong.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/doc/src/examples/customtypesending.qdoc b/doc/src/examples/customtypesending.qdoc index 695ac2e057..41d71175ed 100644 --- a/doc/src/examples/customtypesending.qdoc +++ b/doc/src/examples/customtypesending.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/doc/src/examples/dbus-chat.qdoc b/doc/src/examples/dbus-chat.qdoc index 66dab4ff15..4f636b8b97 100644 --- a/doc/src/examples/dbus-chat.qdoc +++ b/doc/src/examples/dbus-chat.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/doc/src/examples/digiflip.qdoc b/doc/src/examples/digiflip.qdoc index 3bbf210cb8..af3c02acd6 100644 --- a/doc/src/examples/digiflip.qdoc +++ b/doc/src/examples/digiflip.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/doc/src/examples/fingerpaint.qdoc b/doc/src/examples/fingerpaint.qdoc index 7c6c02a497..b0fba0bd80 100644 --- a/doc/src/examples/fingerpaint.qdoc +++ b/doc/src/examples/fingerpaint.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/doc/src/examples/flickable.qdoc b/doc/src/examples/flickable.qdoc index 84ef370c16..63c9be6dd0 100644 --- a/doc/src/examples/flickable.qdoc +++ b/doc/src/examples/flickable.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/doc/src/examples/flightinfo.qdoc b/doc/src/examples/flightinfo.qdoc index 649f2202da..2aa97ad159 100644 --- a/doc/src/examples/flightinfo.qdoc +++ b/doc/src/examples/flightinfo.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/doc/src/examples/htmlinfo.qdoc b/doc/src/examples/htmlinfo.qdoc index 89892ed1e3..1e94829a37 100644 --- a/doc/src/examples/htmlinfo.qdoc +++ b/doc/src/examples/htmlinfo.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/doc/src/examples/lightmaps.qdoc b/doc/src/examples/lightmaps.qdoc index 813090152f..2459de8f3a 100644 --- a/doc/src/examples/lightmaps.qdoc +++ b/doc/src/examples/lightmaps.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/doc/src/examples/pinchzoom.qdoc b/doc/src/examples/pinchzoom.qdoc index 03c757d6df..f4202fce4a 100644 --- a/doc/src/examples/pinchzoom.qdoc +++ b/doc/src/examples/pinchzoom.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/doc/src/examples/raycasting.qdoc b/doc/src/examples/raycasting.qdoc index 8b44218d1e..354459a307 100644 --- a/doc/src/examples/raycasting.qdoc +++ b/doc/src/examples/raycasting.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/doc/src/examples/rsslisting.qdoc b/doc/src/examples/rsslisting.qdoc index a9b9f5202a..654402f48c 100644 --- a/doc/src/examples/rsslisting.qdoc +++ b/doc/src/examples/rsslisting.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/doc/src/examples/styleexample.qdoc b/doc/src/examples/styleexample.qdoc index 06da920af1..2550c5218d 100644 --- a/doc/src/examples/styleexample.qdoc +++ b/doc/src/examples/styleexample.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/doc/src/snippets/code/doc_src_examples_simpledommodel.cpp b/doc/src/snippets/code/doc_src_examples_simpledommodel.cpp index 2b981ace46..fff9e32164 100644 --- a/doc/src/snippets/code/doc_src_examples_simpledommodel.cpp +++ b/doc/src/snippets/code/doc_src_examples_simpledommodel.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/doc/src/snippets/code/doc_src_examples_svgalib.qdoc b/doc/src/snippets/code/doc_src_examples_svgalib.qdoc index d26af310db..d044d81fc3 100644 --- a/doc/src/snippets/code/doc_src_examples_svgalib.qdoc +++ b/doc/src/snippets/code/doc_src_examples_svgalib.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/doc/src/snippets/code/src_corelib_codecs_qtextcodecplugin.cpp b/doc/src/snippets/code/src_corelib_codecs_qtextcodecplugin.cpp index 12ccd391ca..c66c5ad64a 100644 --- a/doc/src/snippets/code/src_corelib_codecs_qtextcodecplugin.cpp +++ b/doc/src/snippets/code/src_corelib_codecs_qtextcodecplugin.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/doc/src/snippets/code/src_corelib_tools_qqueue.cpp b/doc/src/snippets/code/src_corelib_tools_qqueue.cpp index c89427e36d..ebc0a345bf 100644 --- a/doc/src/snippets/code/src_corelib_tools_qqueue.cpp +++ b/doc/src/snippets/code/src_corelib_tools_qqueue.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/doc/src/snippets/code/src_corelib_tools_qvector.cpp b/doc/src/snippets/code/src_corelib_tools_qvector.cpp index f650bc54eb..66b77bd58a 100644 --- a/doc/src/snippets/code/src_corelib_tools_qvector.cpp +++ b/doc/src/snippets/code/src_corelib_tools_qvector.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/doc/src/snippets/code/src_gui_image_qbitmap.cpp b/doc/src/snippets/code/src_gui_image_qbitmap.cpp index be68348a4b..ee85af5a77 100644 --- a/doc/src/snippets/code/src_gui_image_qbitmap.cpp +++ b/doc/src/snippets/code/src_gui_image_qbitmap.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/doc/src/snippets/code/src_gui_kernel_qsound.cpp b/doc/src/snippets/code/src_gui_kernel_qsound.cpp index 58bbd8cb6b..9cb5f33c63 100644 --- a/doc/src/snippets/code/src_gui_kernel_qsound.cpp +++ b/doc/src/snippets/code/src_gui_kernel_qsound.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/doc/src/snippets/code/src_network_access_qhttp.cpp b/doc/src/snippets/code/src_network_access_qhttp.cpp index 19d1cd951b..a5ee98c445 100644 --- a/doc/src/snippets/code/src_network_access_qhttp.cpp +++ b/doc/src/snippets/code/src_network_access_qhttp.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/doc/src/snippets/code/src_sql_kernel_qsqlindex.cpp b/doc/src/snippets/code/src_sql_kernel_qsqlindex.cpp index 755cdbbbb2..66a7b6671b 100644 --- a/doc/src/snippets/code/src_sql_kernel_qsqlindex.cpp +++ b/doc/src/snippets/code/src_sql_kernel_qsqlindex.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/doc/src/snippets/pointer/pointer.cpp b/doc/src/snippets/pointer/pointer.cpp index 7b968f7c96..04789b7b2d 100644 --- a/doc/src/snippets/pointer/pointer.cpp +++ b/doc/src/snippets/pointer/pointer.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/doc/src/snippets/quiloader/main.cpp b/doc/src/snippets/quiloader/main.cpp index 3c686faa4e..e4d628a317 100644 --- a/doc/src/snippets/quiloader/main.cpp +++ b/doc/src/snippets/quiloader/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/doc/src/snippets/quiloader/mywidget.cpp b/doc/src/snippets/quiloader/mywidget.cpp index 34f9712f58..bb77b787f0 100644 --- a/doc/src/snippets/quiloader/mywidget.cpp +++ b/doc/src/snippets/quiloader/mywidget.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/corelib/ipc/doc/src/localfortuneclient.qdoc b/examples/corelib/ipc/doc/src/localfortuneclient.qdoc index d7a90fd946..48cca96a91 100644 --- a/examples/corelib/ipc/doc/src/localfortuneclient.qdoc +++ b/examples/corelib/ipc/doc/src/localfortuneclient.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/corelib/ipc/doc/src/localfortuneserver.qdoc b/examples/corelib/ipc/doc/src/localfortuneserver.qdoc index 47c28e0eb0..340c8d54e1 100644 --- a/examples/corelib/ipc/doc/src/localfortuneserver.qdoc +++ b/examples/corelib/ipc/doc/src/localfortuneserver.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/corelib/ipc/doc/src/sharedmemory.qdoc b/examples/corelib/ipc/doc/src/sharedmemory.qdoc index 60b949df2d..80c0f16006 100644 --- a/examples/corelib/ipc/doc/src/sharedmemory.qdoc +++ b/examples/corelib/ipc/doc/src/sharedmemory.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/corelib/ipc/localfortuneclient/client.cpp b/examples/corelib/ipc/localfortuneclient/client.cpp index 267f5329c8..c3952d4271 100644 --- a/examples/corelib/ipc/localfortuneclient/client.cpp +++ b/examples/corelib/ipc/localfortuneclient/client.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/corelib/ipc/localfortuneclient/client.h b/examples/corelib/ipc/localfortuneclient/client.h index 61b1cd26a4..d8b8ab7c94 100644 --- a/examples/corelib/ipc/localfortuneclient/client.h +++ b/examples/corelib/ipc/localfortuneclient/client.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/corelib/ipc/localfortuneclient/main.cpp b/examples/corelib/ipc/localfortuneclient/main.cpp index f197d7f6cb..09a6ebc367 100644 --- a/examples/corelib/ipc/localfortuneclient/main.cpp +++ b/examples/corelib/ipc/localfortuneclient/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/corelib/ipc/localfortuneserver/main.cpp b/examples/corelib/ipc/localfortuneserver/main.cpp index 0ae70e14ef..e61c6a2768 100644 --- a/examples/corelib/ipc/localfortuneserver/main.cpp +++ b/examples/corelib/ipc/localfortuneserver/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/corelib/ipc/localfortuneserver/server.cpp b/examples/corelib/ipc/localfortuneserver/server.cpp index 6130aaa1c3..f07c24577e 100644 --- a/examples/corelib/ipc/localfortuneserver/server.cpp +++ b/examples/corelib/ipc/localfortuneserver/server.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/corelib/ipc/localfortuneserver/server.h b/examples/corelib/ipc/localfortuneserver/server.h index 4ec7f9b8ef..e10d02ddb5 100644 --- a/examples/corelib/ipc/localfortuneserver/server.h +++ b/examples/corelib/ipc/localfortuneserver/server.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/corelib/ipc/sharedmemory/dialog.cpp b/examples/corelib/ipc/sharedmemory/dialog.cpp index c504f3a202..9784b41d2b 100644 --- a/examples/corelib/ipc/sharedmemory/dialog.cpp +++ b/examples/corelib/ipc/sharedmemory/dialog.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/corelib/ipc/sharedmemory/dialog.h b/examples/corelib/ipc/sharedmemory/dialog.h index fbc39ed4c0..693d2dd845 100644 --- a/examples/corelib/ipc/sharedmemory/dialog.h +++ b/examples/corelib/ipc/sharedmemory/dialog.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/corelib/ipc/sharedmemory/main.cpp b/examples/corelib/ipc/sharedmemory/main.cpp index 0e9f84f3e3..d5e6ce1aa1 100644 --- a/examples/corelib/ipc/sharedmemory/main.cpp +++ b/examples/corelib/ipc/sharedmemory/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/corelib/json/savegame/character.cpp b/examples/corelib/json/savegame/character.cpp index ef30f0eaf4..bbf27213e1 100644 --- a/examples/corelib/json/savegame/character.cpp +++ b/examples/corelib/json/savegame/character.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/corelib/json/savegame/character.h b/examples/corelib/json/savegame/character.h index 32369820f4..def2444cea 100644 --- a/examples/corelib/json/savegame/character.h +++ b/examples/corelib/json/savegame/character.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/corelib/json/savegame/doc/src/savegame.qdoc b/examples/corelib/json/savegame/doc/src/savegame.qdoc index 1de12c38b9..a3eaa50433 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) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/corelib/json/savegame/game.cpp b/examples/corelib/json/savegame/game.cpp index a08071b208..a1bc225c14 100644 --- a/examples/corelib/json/savegame/game.cpp +++ b/examples/corelib/json/savegame/game.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/corelib/json/savegame/game.h b/examples/corelib/json/savegame/game.h index 9216a373d1..38da90af2d 100644 --- a/examples/corelib/json/savegame/game.h +++ b/examples/corelib/json/savegame/game.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/corelib/json/savegame/level.cpp b/examples/corelib/json/savegame/level.cpp index afbd3e0fa0..89abfb1376 100644 --- a/examples/corelib/json/savegame/level.cpp +++ b/examples/corelib/json/savegame/level.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/corelib/json/savegame/level.h b/examples/corelib/json/savegame/level.h index 6cdf508c87..38b98d160d 100644 --- a/examples/corelib/json/savegame/level.h +++ b/examples/corelib/json/savegame/level.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/corelib/json/savegame/main.cpp b/examples/corelib/json/savegame/main.cpp index 1b44306bb0..60fd5655d7 100644 --- a/examples/corelib/json/savegame/main.cpp +++ b/examples/corelib/json/savegame/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/corelib/threads/doc/src/mandelbrot.qdoc b/examples/corelib/threads/doc/src/mandelbrot.qdoc index 75d424e6a4..27f771ee6a 100644 --- a/examples/corelib/threads/doc/src/mandelbrot.qdoc +++ b/examples/corelib/threads/doc/src/mandelbrot.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/corelib/threads/doc/src/queuedcustomtype.qdoc b/examples/corelib/threads/doc/src/queuedcustomtype.qdoc index cca68b4513..ec9ef6477e 100644 --- a/examples/corelib/threads/doc/src/queuedcustomtype.qdoc +++ b/examples/corelib/threads/doc/src/queuedcustomtype.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/corelib/threads/doc/src/semaphores.qdoc b/examples/corelib/threads/doc/src/semaphores.qdoc index 0b1a2e852e..abc961811a 100644 --- a/examples/corelib/threads/doc/src/semaphores.qdoc +++ b/examples/corelib/threads/doc/src/semaphores.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/corelib/threads/doc/src/waitconditions.qdoc b/examples/corelib/threads/doc/src/waitconditions.qdoc index 3d15f0d4bf..a2b49fdbc7 100644 --- a/examples/corelib/threads/doc/src/waitconditions.qdoc +++ b/examples/corelib/threads/doc/src/waitconditions.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/corelib/threads/mandelbrot/main.cpp b/examples/corelib/threads/mandelbrot/main.cpp index 8334d94f9c..3fe5e99886 100644 --- a/examples/corelib/threads/mandelbrot/main.cpp +++ b/examples/corelib/threads/mandelbrot/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/corelib/threads/mandelbrot/mandelbrotwidget.cpp b/examples/corelib/threads/mandelbrot/mandelbrotwidget.cpp index 633d4a1ec5..fd44ec367b 100644 --- a/examples/corelib/threads/mandelbrot/mandelbrotwidget.cpp +++ b/examples/corelib/threads/mandelbrot/mandelbrotwidget.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/corelib/threads/mandelbrot/mandelbrotwidget.h b/examples/corelib/threads/mandelbrot/mandelbrotwidget.h index 183edf2e26..4e561f1099 100644 --- a/examples/corelib/threads/mandelbrot/mandelbrotwidget.h +++ b/examples/corelib/threads/mandelbrot/mandelbrotwidget.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/corelib/threads/mandelbrot/renderthread.cpp b/examples/corelib/threads/mandelbrot/renderthread.cpp index 5779c65c9c..0e5f77255c 100644 --- a/examples/corelib/threads/mandelbrot/renderthread.cpp +++ b/examples/corelib/threads/mandelbrot/renderthread.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/corelib/threads/mandelbrot/renderthread.h b/examples/corelib/threads/mandelbrot/renderthread.h index 881870665f..e0c06ccf30 100644 --- a/examples/corelib/threads/mandelbrot/renderthread.h +++ b/examples/corelib/threads/mandelbrot/renderthread.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/corelib/threads/queuedcustomtype/block.cpp b/examples/corelib/threads/queuedcustomtype/block.cpp index 07bd58cd97..7b330af63b 100644 --- a/examples/corelib/threads/queuedcustomtype/block.cpp +++ b/examples/corelib/threads/queuedcustomtype/block.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/corelib/threads/queuedcustomtype/block.h b/examples/corelib/threads/queuedcustomtype/block.h index f9930340e2..aa82588797 100644 --- a/examples/corelib/threads/queuedcustomtype/block.h +++ b/examples/corelib/threads/queuedcustomtype/block.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/corelib/threads/queuedcustomtype/main.cpp b/examples/corelib/threads/queuedcustomtype/main.cpp index 98933c66f3..f2ebaf6ac2 100644 --- a/examples/corelib/threads/queuedcustomtype/main.cpp +++ b/examples/corelib/threads/queuedcustomtype/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/corelib/threads/queuedcustomtype/renderthread.cpp b/examples/corelib/threads/queuedcustomtype/renderthread.cpp index 50a638987f..9bd06b780d 100644 --- a/examples/corelib/threads/queuedcustomtype/renderthread.cpp +++ b/examples/corelib/threads/queuedcustomtype/renderthread.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/corelib/threads/queuedcustomtype/renderthread.h b/examples/corelib/threads/queuedcustomtype/renderthread.h index 5630926d41..a29e94570e 100644 --- a/examples/corelib/threads/queuedcustomtype/renderthread.h +++ b/examples/corelib/threads/queuedcustomtype/renderthread.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/corelib/threads/queuedcustomtype/window.cpp b/examples/corelib/threads/queuedcustomtype/window.cpp index 8afb8b6782..1da9a54d63 100644 --- a/examples/corelib/threads/queuedcustomtype/window.cpp +++ b/examples/corelib/threads/queuedcustomtype/window.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/corelib/threads/queuedcustomtype/window.h b/examples/corelib/threads/queuedcustomtype/window.h index cb648f1be2..820f15f868 100644 --- a/examples/corelib/threads/queuedcustomtype/window.h +++ b/examples/corelib/threads/queuedcustomtype/window.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/corelib/threads/semaphores/semaphores.cpp b/examples/corelib/threads/semaphores/semaphores.cpp index f519e5f323..f9898e2b24 100644 --- a/examples/corelib/threads/semaphores/semaphores.cpp +++ b/examples/corelib/threads/semaphores/semaphores.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/corelib/threads/waitconditions/waitconditions.cpp b/examples/corelib/threads/waitconditions/waitconditions.cpp index b0336f4c2b..dd91915d68 100644 --- a/examples/corelib/threads/waitconditions/waitconditions.cpp +++ b/examples/corelib/threads/waitconditions/waitconditions.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/corelib/tools/contiguouscache/main.cpp b/examples/corelib/tools/contiguouscache/main.cpp index 62fa8dcf42..a8a3ebd110 100644 --- a/examples/corelib/tools/contiguouscache/main.cpp +++ b/examples/corelib/tools/contiguouscache/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/corelib/tools/contiguouscache/randomlistmodel.cpp b/examples/corelib/tools/contiguouscache/randomlistmodel.cpp index cd1a301dc7..cb2d4a5e76 100644 --- a/examples/corelib/tools/contiguouscache/randomlistmodel.cpp +++ b/examples/corelib/tools/contiguouscache/randomlistmodel.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/corelib/tools/contiguouscache/randomlistmodel.h b/examples/corelib/tools/contiguouscache/randomlistmodel.h index 3acafc23ff..fdd79f75c5 100644 --- a/examples/corelib/tools/contiguouscache/randomlistmodel.h +++ b/examples/corelib/tools/contiguouscache/randomlistmodel.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/corelib/tools/customtype/main.cpp b/examples/corelib/tools/customtype/main.cpp index 8e97d3db96..f25da2ca57 100644 --- a/examples/corelib/tools/customtype/main.cpp +++ b/examples/corelib/tools/customtype/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/corelib/tools/customtype/message.cpp b/examples/corelib/tools/customtype/message.cpp index eb8befc36f..a7e15c7c29 100644 --- a/examples/corelib/tools/customtype/message.cpp +++ b/examples/corelib/tools/customtype/message.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/corelib/tools/customtype/message.h b/examples/corelib/tools/customtype/message.h index cdc4e39caf..3f83b83682 100644 --- a/examples/corelib/tools/customtype/message.h +++ b/examples/corelib/tools/customtype/message.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/corelib/tools/customtypesending/main.cpp b/examples/corelib/tools/customtypesending/main.cpp index 5f01e2a154..86cadff110 100644 --- a/examples/corelib/tools/customtypesending/main.cpp +++ b/examples/corelib/tools/customtypesending/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/corelib/tools/customtypesending/message.cpp b/examples/corelib/tools/customtypesending/message.cpp index 9b53b8757d..cff21f59b0 100644 --- a/examples/corelib/tools/customtypesending/message.cpp +++ b/examples/corelib/tools/customtypesending/message.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/corelib/tools/customtypesending/message.h b/examples/corelib/tools/customtypesending/message.h index 3e5f17db2b..bac5b6ee4a 100644 --- a/examples/corelib/tools/customtypesending/message.h +++ b/examples/corelib/tools/customtypesending/message.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/corelib/tools/customtypesending/window.cpp b/examples/corelib/tools/customtypesending/window.cpp index aa4a7eab3c..ed1315aab7 100644 --- a/examples/corelib/tools/customtypesending/window.cpp +++ b/examples/corelib/tools/customtypesending/window.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/corelib/tools/customtypesending/window.h b/examples/corelib/tools/customtypesending/window.h index 0889800064..b3b41c487f 100644 --- a/examples/corelib/tools/customtypesending/window.h +++ b/examples/corelib/tools/customtypesending/window.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/corelib/tools/doc/src/contiguouscache.qdoc b/examples/corelib/tools/doc/src/contiguouscache.qdoc index e88b2629b8..19bc46080d 100644 --- a/examples/corelib/tools/doc/src/contiguouscache.qdoc +++ b/examples/corelib/tools/doc/src/contiguouscache.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/corelib/tools/doc/src/customtype.qdoc b/examples/corelib/tools/doc/src/customtype.qdoc index f03fafec30..5efad6636c 100644 --- a/examples/corelib/tools/doc/src/customtype.qdoc +++ b/examples/corelib/tools/doc/src/customtype.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/dbus/chat/chat.cpp b/examples/dbus/chat/chat.cpp index 3c78bc47f1..9c8653a1c6 100644 --- a/examples/dbus/chat/chat.cpp +++ b/examples/dbus/chat/chat.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/dbus/chat/chat.h b/examples/dbus/chat/chat.h index f8a0c591b3..46fc8d997a 100644 --- a/examples/dbus/chat/chat.h +++ b/examples/dbus/chat/chat.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/dbus/complexpingpong/complexping.cpp b/examples/dbus/complexpingpong/complexping.cpp index 61c918534f..1e2ad6d6d5 100644 --- a/examples/dbus/complexpingpong/complexping.cpp +++ b/examples/dbus/complexpingpong/complexping.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/dbus/complexpingpong/complexping.h b/examples/dbus/complexpingpong/complexping.h index bfa2795ba9..1b254127ad 100644 --- a/examples/dbus/complexpingpong/complexping.h +++ b/examples/dbus/complexpingpong/complexping.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/dbus/complexpingpong/complexpong.cpp b/examples/dbus/complexpingpong/complexpong.cpp index fe122345f0..d03df4dc32 100644 --- a/examples/dbus/complexpingpong/complexpong.cpp +++ b/examples/dbus/complexpingpong/complexpong.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/dbus/complexpingpong/complexpong.h b/examples/dbus/complexpingpong/complexpong.h index 47ba2a0814..5fac85f1a1 100644 --- a/examples/dbus/complexpingpong/complexpong.h +++ b/examples/dbus/complexpingpong/complexpong.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/dbus/complexpingpong/ping-common.h b/examples/dbus/complexpingpong/ping-common.h index dbc93fb5d9..65c4500806 100644 --- a/examples/dbus/complexpingpong/ping-common.h +++ b/examples/dbus/complexpingpong/ping-common.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/dbus/doc/src/chat.qdoc b/examples/dbus/doc/src/chat.qdoc index daf3eccc9a..32c3838a1f 100644 --- a/examples/dbus/doc/src/chat.qdoc +++ b/examples/dbus/doc/src/chat.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/dbus/doc/src/complexpingpong.qdoc b/examples/dbus/doc/src/complexpingpong.qdoc index ef9df18eab..cd0015492e 100644 --- a/examples/dbus/doc/src/complexpingpong.qdoc +++ b/examples/dbus/doc/src/complexpingpong.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/dbus/doc/src/listnames.qdoc b/examples/dbus/doc/src/listnames.qdoc index a0376e10a7..c414715174 100644 --- a/examples/dbus/doc/src/listnames.qdoc +++ b/examples/dbus/doc/src/listnames.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/dbus/doc/src/pingpong.qdoc b/examples/dbus/doc/src/pingpong.qdoc index dcaeb12043..d6b0d4b716 100644 --- a/examples/dbus/doc/src/pingpong.qdoc +++ b/examples/dbus/doc/src/pingpong.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/dbus/listnames/listnames.cpp b/examples/dbus/listnames/listnames.cpp index 89624b689a..1f969ffca6 100644 --- a/examples/dbus/listnames/listnames.cpp +++ b/examples/dbus/listnames/listnames.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/dbus/pingpong/ping-common.h b/examples/dbus/pingpong/ping-common.h index dbc93fb5d9..65c4500806 100644 --- a/examples/dbus/pingpong/ping-common.h +++ b/examples/dbus/pingpong/ping-common.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/dbus/pingpong/ping.cpp b/examples/dbus/pingpong/ping.cpp index 030d7da335..72b599c518 100644 --- a/examples/dbus/pingpong/ping.cpp +++ b/examples/dbus/pingpong/ping.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/dbus/pingpong/pong.cpp b/examples/dbus/pingpong/pong.cpp index 5f242569f1..fa78d246f8 100644 --- a/examples/dbus/pingpong/pong.cpp +++ b/examples/dbus/pingpong/pong.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/dbus/pingpong/pong.h b/examples/dbus/pingpong/pong.h index e2d578011b..c65125faf9 100644 --- a/examples/dbus/pingpong/pong.h +++ b/examples/dbus/pingpong/pong.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/dbus/remotecontrolledcar/car/car.cpp b/examples/dbus/remotecontrolledcar/car/car.cpp index 00bdc1adc3..a5cbafee9b 100644 --- a/examples/dbus/remotecontrolledcar/car/car.cpp +++ b/examples/dbus/remotecontrolledcar/car/car.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/dbus/remotecontrolledcar/car/car.h b/examples/dbus/remotecontrolledcar/car/car.h index b467201675..d4cb8faab3 100644 --- a/examples/dbus/remotecontrolledcar/car/car.h +++ b/examples/dbus/remotecontrolledcar/car/car.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/dbus/remotecontrolledcar/car/main.cpp b/examples/dbus/remotecontrolledcar/car/main.cpp index 52a685dc9b..5f40a37d05 100644 --- a/examples/dbus/remotecontrolledcar/car/main.cpp +++ b/examples/dbus/remotecontrolledcar/car/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/dbus/remotecontrolledcar/controller/controller.cpp b/examples/dbus/remotecontrolledcar/controller/controller.cpp index 5951a2e718..d2ac14eedf 100644 --- a/examples/dbus/remotecontrolledcar/controller/controller.cpp +++ b/examples/dbus/remotecontrolledcar/controller/controller.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/dbus/remotecontrolledcar/controller/controller.h b/examples/dbus/remotecontrolledcar/controller/controller.h index 3bbb9d7fb1..00dc44ff20 100644 --- a/examples/dbus/remotecontrolledcar/controller/controller.h +++ b/examples/dbus/remotecontrolledcar/controller/controller.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/dbus/remotecontrolledcar/controller/main.cpp b/examples/dbus/remotecontrolledcar/controller/main.cpp index a8b9ff4e97..6850b044b5 100644 --- a/examples/dbus/remotecontrolledcar/controller/main.cpp +++ b/examples/dbus/remotecontrolledcar/controller/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/dbus/remotecontrolledcar/doc/src/dbus-remotecontrolledcar.qdoc b/examples/dbus/remotecontrolledcar/doc/src/dbus-remotecontrolledcar.qdoc index a485a99299..bf457bebe3 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) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/embedded/digiflip/digiflip.cpp b/examples/embedded/digiflip/digiflip.cpp index c4d25d438d..3bb3023caf 100644 --- a/examples/embedded/digiflip/digiflip.cpp +++ b/examples/embedded/digiflip/digiflip.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the demonstration applications of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/examples/embedded/flickable/flickable.cpp b/examples/embedded/flickable/flickable.cpp index 8886f454c3..fb8b6cfadf 100644 --- a/examples/embedded/flickable/flickable.cpp +++ b/examples/embedded/flickable/flickable.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the demonstration applications of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/examples/embedded/flickable/flickable.h b/examples/embedded/flickable/flickable.h index e13fc291ea..3d1b2f95d0 100644 --- a/examples/embedded/flickable/flickable.h +++ b/examples/embedded/flickable/flickable.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the demonstration applications of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/examples/embedded/flickable/main.cpp b/examples/embedded/flickable/main.cpp index c1c5daef76..6d8cc779dd 100644 --- a/examples/embedded/flickable/main.cpp +++ b/examples/embedded/flickable/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the demonstration applications of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/examples/embedded/flightinfo/flightinfo.cpp b/examples/embedded/flightinfo/flightinfo.cpp index 9ce9727cf7..5e81c748f6 100644 --- a/examples/embedded/flightinfo/flightinfo.cpp +++ b/examples/embedded/flightinfo/flightinfo.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the demonstration applications of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/examples/embedded/lightmaps/lightmaps.cpp b/examples/embedded/lightmaps/lightmaps.cpp index 4dd249c1a2..95240183c9 100644 --- a/examples/embedded/lightmaps/lightmaps.cpp +++ b/examples/embedded/lightmaps/lightmaps.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the demonstration applications of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/examples/embedded/lightmaps/lightmaps.h b/examples/embedded/lightmaps/lightmaps.h index e4f9ffdf02..40ecec0670 100644 --- a/examples/embedded/lightmaps/lightmaps.h +++ b/examples/embedded/lightmaps/lightmaps.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the demonstration applications of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/examples/embedded/lightmaps/main.cpp b/examples/embedded/lightmaps/main.cpp index 4981ea0618..cbb66ec758 100644 --- a/examples/embedded/lightmaps/main.cpp +++ b/examples/embedded/lightmaps/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the demonstration applications of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/examples/embedded/lightmaps/mapzoom.cpp b/examples/embedded/lightmaps/mapzoom.cpp index 221db2f232..e52d6afc95 100644 --- a/examples/embedded/lightmaps/mapzoom.cpp +++ b/examples/embedded/lightmaps/mapzoom.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the demonstration applications of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/examples/embedded/lightmaps/mapzoom.h b/examples/embedded/lightmaps/mapzoom.h index 2d2552d0da..cd8757a164 100644 --- a/examples/embedded/lightmaps/mapzoom.h +++ b/examples/embedded/lightmaps/mapzoom.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the demonstration applications of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/examples/embedded/lightmaps/slippymap.cpp b/examples/embedded/lightmaps/slippymap.cpp index 018d68845a..8f41124bdf 100644 --- a/examples/embedded/lightmaps/slippymap.cpp +++ b/examples/embedded/lightmaps/slippymap.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the demonstration applications of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ @@ -190,7 +190,7 @@ void SlippyMap::download() m_url = QUrl(path.arg(zoom).arg(grab.x()).arg(grab.y())); QNetworkRequest request; request.setUrl(m_url); - request.setRawHeader("User-Agent", "Digia (Qt) Graphics Dojo 1.0"); + request.setRawHeader("User-Agent", "The Qt Company (Qt) Graphics Dojo 1.0"); request.setAttribute(QNetworkRequest::User, QVariant(grab)); m_manager.get(request); } diff --git a/examples/embedded/lightmaps/slippymap.h b/examples/embedded/lightmaps/slippymap.h index fbe3a80c38..66d2985b9e 100644 --- a/examples/embedded/lightmaps/slippymap.h +++ b/examples/embedded/lightmaps/slippymap.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the demonstration applications of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/examples/embedded/raycasting/raycasting.cpp b/examples/embedded/raycasting/raycasting.cpp index 8d1882894b..466f10d7fa 100644 --- a/examples/embedded/raycasting/raycasting.cpp +++ b/examples/embedded/raycasting/raycasting.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the demonstration applications of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/examples/embedded/styleexample/main.cpp b/examples/embedded/styleexample/main.cpp index 7d5dcca1dc..f1ee7007c0 100644 --- a/examples/embedded/styleexample/main.cpp +++ b/examples/embedded/styleexample/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the demonstration applications of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/examples/embedded/styleexample/stylewidget.cpp b/examples/embedded/styleexample/stylewidget.cpp index 86d813da69..c0926a6826 100644 --- a/examples/embedded/styleexample/stylewidget.cpp +++ b/examples/embedded/styleexample/stylewidget.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the demonstration applications of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/examples/embedded/styleexample/stylewidget.h b/examples/embedded/styleexample/stylewidget.h index ccee47a1f1..5427b63894 100644 --- a/examples/embedded/styleexample/stylewidget.h +++ b/examples/embedded/styleexample/stylewidget.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the demonstration applications of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/examples/gui/analogclock/main.cpp b/examples/gui/analogclock/main.cpp index d51f440dff..defb9b487e 100644 --- a/examples/gui/analogclock/main.cpp +++ b/examples/gui/analogclock/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/gui/doc/src/analogclockwindow.qdoc b/examples/gui/doc/src/analogclockwindow.qdoc index b5a6fc575f..91242169ab 100644 --- a/examples/gui/doc/src/analogclockwindow.qdoc +++ b/examples/gui/doc/src/analogclockwindow.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/gui/doc/src/openglwindow.qdoc b/examples/gui/doc/src/openglwindow.qdoc index 524ed908e8..3ea85b4267 100644 --- a/examples/gui/doc/src/openglwindow.qdoc +++ b/examples/gui/doc/src/openglwindow.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/gui/doc/src/rasterwindow.qdoc b/examples/gui/doc/src/rasterwindow.qdoc index 4d9586bb9f..22bd8cfae7 100644 --- a/examples/gui/doc/src/rasterwindow.qdoc +++ b/examples/gui/doc/src/rasterwindow.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/gui/openglwindow/main.cpp b/examples/gui/openglwindow/main.cpp index 0b0a0e19f0..9e4fc5cd05 100644 --- a/examples/gui/openglwindow/main.cpp +++ b/examples/gui/openglwindow/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/gui/openglwindow/openglwindow.cpp b/examples/gui/openglwindow/openglwindow.cpp index afebf521f3..8bbcb85ba7 100644 --- a/examples/gui/openglwindow/openglwindow.cpp +++ b/examples/gui/openglwindow/openglwindow.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/gui/openglwindow/openglwindow.h b/examples/gui/openglwindow/openglwindow.h index cee888250b..5a4c800259 100644 --- a/examples/gui/openglwindow/openglwindow.h +++ b/examples/gui/openglwindow/openglwindow.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/gui/rasterwindow/main.cpp b/examples/gui/rasterwindow/main.cpp index f34a419ebf..33a6fa7974 100644 --- a/examples/gui/rasterwindow/main.cpp +++ b/examples/gui/rasterwindow/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/gui/rasterwindow/rasterwindow.cpp b/examples/gui/rasterwindow/rasterwindow.cpp index f5a4d54545..f0f59531a1 100644 --- a/examples/gui/rasterwindow/rasterwindow.cpp +++ b/examples/gui/rasterwindow/rasterwindow.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/gui/rasterwindow/rasterwindow.h b/examples/gui/rasterwindow/rasterwindow.h index bca73c19e7..3a3683d20c 100644 --- a/examples/gui/rasterwindow/rasterwindow.h +++ b/examples/gui/rasterwindow/rasterwindow.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/bearermonitor/bearermonitor.cpp b/examples/network/bearermonitor/bearermonitor.cpp index 2d8fbf42b1..d3f68fa4df 100644 --- a/examples/network/bearermonitor/bearermonitor.cpp +++ b/examples/network/bearermonitor/bearermonitor.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/bearermonitor/bearermonitor.h b/examples/network/bearermonitor/bearermonitor.h index 307262c2b4..22dd445f41 100644 --- a/examples/network/bearermonitor/bearermonitor.h +++ b/examples/network/bearermonitor/bearermonitor.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/bearermonitor/main.cpp b/examples/network/bearermonitor/main.cpp index e41bc26ea1..eaf2a6deb9 100644 --- a/examples/network/bearermonitor/main.cpp +++ b/examples/network/bearermonitor/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/bearermonitor/sessionwidget.cpp b/examples/network/bearermonitor/sessionwidget.cpp index b40d6a7e42..bbeec6bf88 100644 --- a/examples/network/bearermonitor/sessionwidget.cpp +++ b/examples/network/bearermonitor/sessionwidget.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/bearermonitor/sessionwidget.h b/examples/network/bearermonitor/sessionwidget.h index ac9d88c00e..30555c3b7d 100644 --- a/examples/network/bearermonitor/sessionwidget.h +++ b/examples/network/bearermonitor/sessionwidget.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/blockingfortuneclient/blockingclient.cpp b/examples/network/blockingfortuneclient/blockingclient.cpp index 67fa111b56..1d9ce0ff89 100644 --- a/examples/network/blockingfortuneclient/blockingclient.cpp +++ b/examples/network/blockingfortuneclient/blockingclient.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/blockingfortuneclient/blockingclient.h b/examples/network/blockingfortuneclient/blockingclient.h index 4dd3411051..814e0dde21 100644 --- a/examples/network/blockingfortuneclient/blockingclient.h +++ b/examples/network/blockingfortuneclient/blockingclient.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/blockingfortuneclient/fortunethread.cpp b/examples/network/blockingfortuneclient/fortunethread.cpp index 08db89f34e..b9f55f302b 100644 --- a/examples/network/blockingfortuneclient/fortunethread.cpp +++ b/examples/network/blockingfortuneclient/fortunethread.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/blockingfortuneclient/fortunethread.h b/examples/network/blockingfortuneclient/fortunethread.h index 1986873dd9..8f73a797a7 100644 --- a/examples/network/blockingfortuneclient/fortunethread.h +++ b/examples/network/blockingfortuneclient/fortunethread.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/blockingfortuneclient/main.cpp b/examples/network/blockingfortuneclient/main.cpp index 16b1c79dfc..ed3ea3a2cb 100644 --- a/examples/network/blockingfortuneclient/main.cpp +++ b/examples/network/blockingfortuneclient/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/broadcastreceiver/main.cpp b/examples/network/broadcastreceiver/main.cpp index 8ef4b2feee..feb3d911f8 100644 --- a/examples/network/broadcastreceiver/main.cpp +++ b/examples/network/broadcastreceiver/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/broadcastreceiver/receiver.cpp b/examples/network/broadcastreceiver/receiver.cpp index 8cc56d2b25..aee6cd2dfb 100644 --- a/examples/network/broadcastreceiver/receiver.cpp +++ b/examples/network/broadcastreceiver/receiver.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/broadcastreceiver/receiver.h b/examples/network/broadcastreceiver/receiver.h index 5fb9d06918..f6a80a814e 100644 --- a/examples/network/broadcastreceiver/receiver.h +++ b/examples/network/broadcastreceiver/receiver.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/broadcastsender/main.cpp b/examples/network/broadcastsender/main.cpp index 63833f39a6..4b1b4594a7 100644 --- a/examples/network/broadcastsender/main.cpp +++ b/examples/network/broadcastsender/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/broadcastsender/sender.cpp b/examples/network/broadcastsender/sender.cpp index 6930583759..002a73eb21 100644 --- a/examples/network/broadcastsender/sender.cpp +++ b/examples/network/broadcastsender/sender.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/broadcastsender/sender.h b/examples/network/broadcastsender/sender.h index c8f50c4d7e..21c3baf192 100644 --- a/examples/network/broadcastsender/sender.h +++ b/examples/network/broadcastsender/sender.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/dnslookup/dnslookup.cpp b/examples/network/dnslookup/dnslookup.cpp index 003a3e3028..81044c2756 100644 --- a/examples/network/dnslookup/dnslookup.cpp +++ b/examples/network/dnslookup/dnslookup.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2012 Jeremy Lainé -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/dnslookup/dnslookup.h b/examples/network/dnslookup/dnslookup.h index 4d0232be8a..4a293c5219 100644 --- a/examples/network/dnslookup/dnslookup.h +++ b/examples/network/dnslookup/dnslookup.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2012 Jeremy Lainé -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/doc/src/blockingfortuneclient.qdoc b/examples/network/doc/src/blockingfortuneclient.qdoc index 2d77d3fcba..fbbfd466a5 100644 --- a/examples/network/doc/src/blockingfortuneclient.qdoc +++ b/examples/network/doc/src/blockingfortuneclient.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/network/doc/src/broadcastreceiver.qdoc b/examples/network/doc/src/broadcastreceiver.qdoc index 03f94c7388..b9486229f0 100644 --- a/examples/network/doc/src/broadcastreceiver.qdoc +++ b/examples/network/doc/src/broadcastreceiver.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/network/doc/src/broadcastsender.qdoc b/examples/network/doc/src/broadcastsender.qdoc index 10fc980f79..53f806ddf5 100644 --- a/examples/network/doc/src/broadcastsender.qdoc +++ b/examples/network/doc/src/broadcastsender.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/network/doc/src/fortuneclient.qdoc b/examples/network/doc/src/fortuneclient.qdoc index 01acf45837..d9ebb575df 100644 --- a/examples/network/doc/src/fortuneclient.qdoc +++ b/examples/network/doc/src/fortuneclient.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/network/doc/src/fortuneserver.qdoc b/examples/network/doc/src/fortuneserver.qdoc index fd61f864f0..c55a1634e4 100644 --- a/examples/network/doc/src/fortuneserver.qdoc +++ b/examples/network/doc/src/fortuneserver.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/network/doc/src/googlesuggest.qdoc b/examples/network/doc/src/googlesuggest.qdoc index dd52b3565f..912947dfdf 100644 --- a/examples/network/doc/src/googlesuggest.qdoc +++ b/examples/network/doc/src/googlesuggest.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/network/doc/src/http.qdoc b/examples/network/doc/src/http.qdoc index 940c331eb2..f7f449cf8a 100644 --- a/examples/network/doc/src/http.qdoc +++ b/examples/network/doc/src/http.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/network/doc/src/loopback.qdoc b/examples/network/doc/src/loopback.qdoc index b106c06211..af1b0e8352 100644 --- a/examples/network/doc/src/loopback.qdoc +++ b/examples/network/doc/src/loopback.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/network/doc/src/multicastreceiver.qdoc b/examples/network/doc/src/multicastreceiver.qdoc index d008ec1883..0a087f64f3 100644 --- a/examples/network/doc/src/multicastreceiver.qdoc +++ b/examples/network/doc/src/multicastreceiver.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/network/doc/src/multicastsender.qdoc b/examples/network/doc/src/multicastsender.qdoc index 81f95b392a..94b295b103 100644 --- a/examples/network/doc/src/multicastsender.qdoc +++ b/examples/network/doc/src/multicastsender.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/network/doc/src/network-chat.qdoc b/examples/network/doc/src/network-chat.qdoc index d6d1931757..1cc1e9f0dd 100644 --- a/examples/network/doc/src/network-chat.qdoc +++ b/examples/network/doc/src/network-chat.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/network/doc/src/network-download.qdoc b/examples/network/doc/src/network-download.qdoc index 60a6fab3c4..bd9b90014a 100644 --- a/examples/network/doc/src/network-download.qdoc +++ b/examples/network/doc/src/network-download.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/network/doc/src/network-downloadmanager.qdoc b/examples/network/doc/src/network-downloadmanager.qdoc index d4eacf4199..248daabdce 100644 --- a/examples/network/doc/src/network-downloadmanager.qdoc +++ b/examples/network/doc/src/network-downloadmanager.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/network/doc/src/securesocketclient.qdoc b/examples/network/doc/src/securesocketclient.qdoc index 01581a3737..a5ceb67223 100644 --- a/examples/network/doc/src/securesocketclient.qdoc +++ b/examples/network/doc/src/securesocketclient.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/network/doc/src/threadedfortuneserver.qdoc b/examples/network/doc/src/threadedfortuneserver.qdoc index 1b64e30226..c1cfbb12ed 100644 --- a/examples/network/doc/src/threadedfortuneserver.qdoc +++ b/examples/network/doc/src/threadedfortuneserver.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/network/doc/src/torrent.qdoc b/examples/network/doc/src/torrent.qdoc index b50cd4e488..08857f02d3 100644 --- a/examples/network/doc/src/torrent.qdoc +++ b/examples/network/doc/src/torrent.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/network/download/main.cpp b/examples/network/download/main.cpp index 8e8fec3b84..840fce745f 100644 --- a/examples/network/download/main.cpp +++ b/examples/network/download/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/downloadmanager/downloadmanager.cpp b/examples/network/downloadmanager/downloadmanager.cpp index 70d5e033b7..ec7e872aee 100644 --- a/examples/network/downloadmanager/downloadmanager.cpp +++ b/examples/network/downloadmanager/downloadmanager.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/downloadmanager/downloadmanager.h b/examples/network/downloadmanager/downloadmanager.h index d3d4bfba74..ca3d47447a 100644 --- a/examples/network/downloadmanager/downloadmanager.h +++ b/examples/network/downloadmanager/downloadmanager.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/downloadmanager/main.cpp b/examples/network/downloadmanager/main.cpp index 60caea9da5..5c3bf7c872 100644 --- a/examples/network/downloadmanager/main.cpp +++ b/examples/network/downloadmanager/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/downloadmanager/textprogressbar.cpp b/examples/network/downloadmanager/textprogressbar.cpp index eb65c79037..ae2466a004 100644 --- a/examples/network/downloadmanager/textprogressbar.cpp +++ b/examples/network/downloadmanager/textprogressbar.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/downloadmanager/textprogressbar.h b/examples/network/downloadmanager/textprogressbar.h index 2a397c7572..401d62120c 100644 --- a/examples/network/downloadmanager/textprogressbar.h +++ b/examples/network/downloadmanager/textprogressbar.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/fortuneclient/client.cpp b/examples/network/fortuneclient/client.cpp index fd5d59fd83..27a5f88b83 100644 --- a/examples/network/fortuneclient/client.cpp +++ b/examples/network/fortuneclient/client.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/fortuneclient/client.h b/examples/network/fortuneclient/client.h index 161cd0eccc..73a069b0f7 100644 --- a/examples/network/fortuneclient/client.h +++ b/examples/network/fortuneclient/client.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/fortuneclient/main.cpp b/examples/network/fortuneclient/main.cpp index bddaaa6d14..0b2b45e2de 100644 --- a/examples/network/fortuneclient/main.cpp +++ b/examples/network/fortuneclient/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/fortuneserver/main.cpp b/examples/network/fortuneserver/main.cpp index 0ae70e14ef..e61c6a2768 100644 --- a/examples/network/fortuneserver/main.cpp +++ b/examples/network/fortuneserver/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/fortuneserver/server.cpp b/examples/network/fortuneserver/server.cpp index da7377445c..49e6bc7951 100644 --- a/examples/network/fortuneserver/server.cpp +++ b/examples/network/fortuneserver/server.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/fortuneserver/server.h b/examples/network/fortuneserver/server.h index b64c7d5e1f..a77dfa489e 100644 --- a/examples/network/fortuneserver/server.h +++ b/examples/network/fortuneserver/server.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/googlesuggest/googlesuggest.cpp b/examples/network/googlesuggest/googlesuggest.cpp index ac5cd162b1..4c3b9a468d 100644 --- a/examples/network/googlesuggest/googlesuggest.cpp +++ b/examples/network/googlesuggest/googlesuggest.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/googlesuggest/googlesuggest.h b/examples/network/googlesuggest/googlesuggest.h index 818a0512e2..3e9e1cf924 100644 --- a/examples/network/googlesuggest/googlesuggest.h +++ b/examples/network/googlesuggest/googlesuggest.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/googlesuggest/main.cpp b/examples/network/googlesuggest/main.cpp index 4945c9c7a7..7bb643c20d 100644 --- a/examples/network/googlesuggest/main.cpp +++ b/examples/network/googlesuggest/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/googlesuggest/searchbox.cpp b/examples/network/googlesuggest/searchbox.cpp index 39c61fbc7e..92ca2d2b09 100644 --- a/examples/network/googlesuggest/searchbox.cpp +++ b/examples/network/googlesuggest/searchbox.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/googlesuggest/searchbox.h b/examples/network/googlesuggest/searchbox.h index 160d85c3c5..96b7f81ea1 100644 --- a/examples/network/googlesuggest/searchbox.h +++ b/examples/network/googlesuggest/searchbox.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/http/httpwindow.cpp b/examples/network/http/httpwindow.cpp index 2b689c7770..5317e9a460 100644 --- a/examples/network/http/httpwindow.cpp +++ b/examples/network/http/httpwindow.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/http/httpwindow.h b/examples/network/http/httpwindow.h index 42409726b6..03019ce8dd 100644 --- a/examples/network/http/httpwindow.h +++ b/examples/network/http/httpwindow.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/http/main.cpp b/examples/network/http/main.cpp index 5fdbcd17af..8a596dccb9 100644 --- a/examples/network/http/main.cpp +++ b/examples/network/http/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/loopback/dialog.cpp b/examples/network/loopback/dialog.cpp index da5dbce854..87d6249259 100644 --- a/examples/network/loopback/dialog.cpp +++ b/examples/network/loopback/dialog.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/loopback/dialog.h b/examples/network/loopback/dialog.h index 13a07b6ab2..8fb9f3f457 100644 --- a/examples/network/loopback/dialog.h +++ b/examples/network/loopback/dialog.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/loopback/main.cpp b/examples/network/loopback/main.cpp index 3ca9b134cf..587e10b3a6 100644 --- a/examples/network/loopback/main.cpp +++ b/examples/network/loopback/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/multicastreceiver/main.cpp b/examples/network/multicastreceiver/main.cpp index 8ef4b2feee..feb3d911f8 100644 --- a/examples/network/multicastreceiver/main.cpp +++ b/examples/network/multicastreceiver/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/multicastreceiver/receiver.cpp b/examples/network/multicastreceiver/receiver.cpp index d2ddbb3b28..22b1fefd99 100644 --- a/examples/network/multicastreceiver/receiver.cpp +++ b/examples/network/multicastreceiver/receiver.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/multicastreceiver/receiver.h b/examples/network/multicastreceiver/receiver.h index eccc86dc20..6417d15225 100644 --- a/examples/network/multicastreceiver/receiver.h +++ b/examples/network/multicastreceiver/receiver.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/multicastsender/main.cpp b/examples/network/multicastsender/main.cpp index 63833f39a6..4b1b4594a7 100644 --- a/examples/network/multicastsender/main.cpp +++ b/examples/network/multicastsender/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/multicastsender/sender.cpp b/examples/network/multicastsender/sender.cpp index bf2c8ba34e..59e461b2d5 100644 --- a/examples/network/multicastsender/sender.cpp +++ b/examples/network/multicastsender/sender.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/multicastsender/sender.h b/examples/network/multicastsender/sender.h index 9c1dc87be0..242287e567 100644 --- a/examples/network/multicastsender/sender.h +++ b/examples/network/multicastsender/sender.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/network-chat/chatdialog.cpp b/examples/network/network-chat/chatdialog.cpp index 1caa4513cf..36e0368a24 100644 --- a/examples/network/network-chat/chatdialog.cpp +++ b/examples/network/network-chat/chatdialog.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/network-chat/chatdialog.h b/examples/network/network-chat/chatdialog.h index f18c4a7cbd..d02dd2b5ef 100644 --- a/examples/network/network-chat/chatdialog.h +++ b/examples/network/network-chat/chatdialog.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/network-chat/client.cpp b/examples/network/network-chat/client.cpp index 3c631be982..a2097a90c6 100644 --- a/examples/network/network-chat/client.cpp +++ b/examples/network/network-chat/client.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/network-chat/client.h b/examples/network/network-chat/client.h index b947bc2cba..842a097093 100644 --- a/examples/network/network-chat/client.h +++ b/examples/network/network-chat/client.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/network-chat/connection.cpp b/examples/network/network-chat/connection.cpp index a90deb86e3..2943b9585f 100644 --- a/examples/network/network-chat/connection.cpp +++ b/examples/network/network-chat/connection.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/network-chat/connection.h b/examples/network/network-chat/connection.h index 2a0603a46f..f414ec18a6 100644 --- a/examples/network/network-chat/connection.h +++ b/examples/network/network-chat/connection.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/network-chat/main.cpp b/examples/network/network-chat/main.cpp index d5450e2b82..f041b5d6b5 100644 --- a/examples/network/network-chat/main.cpp +++ b/examples/network/network-chat/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/network-chat/peermanager.cpp b/examples/network/network-chat/peermanager.cpp index 6106ed40bf..05e84a90c4 100644 --- a/examples/network/network-chat/peermanager.cpp +++ b/examples/network/network-chat/peermanager.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/network-chat/peermanager.h b/examples/network/network-chat/peermanager.h index 0c4e1faf85..ad611b0008 100644 --- a/examples/network/network-chat/peermanager.h +++ b/examples/network/network-chat/peermanager.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/network-chat/server.cpp b/examples/network/network-chat/server.cpp index ba4e5b26c3..0434649a16 100644 --- a/examples/network/network-chat/server.cpp +++ b/examples/network/network-chat/server.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/network-chat/server.h b/examples/network/network-chat/server.h index 971eafe10c..364f04442c 100644 --- a/examples/network/network-chat/server.h +++ b/examples/network/network-chat/server.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/securesocketclient/certificateinfo.cpp b/examples/network/securesocketclient/certificateinfo.cpp index ba2c707b92..0149ce0e18 100644 --- a/examples/network/securesocketclient/certificateinfo.cpp +++ b/examples/network/securesocketclient/certificateinfo.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/securesocketclient/certificateinfo.h b/examples/network/securesocketclient/certificateinfo.h index 8ddb9d6dda..0cacbc9050 100644 --- a/examples/network/securesocketclient/certificateinfo.h +++ b/examples/network/securesocketclient/certificateinfo.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/securesocketclient/main.cpp b/examples/network/securesocketclient/main.cpp index 46beaf0d4f..ca8b635810 100644 --- a/examples/network/securesocketclient/main.cpp +++ b/examples/network/securesocketclient/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/securesocketclient/sslclient.cpp b/examples/network/securesocketclient/sslclient.cpp index 0cec70c742..6e5b1829d8 100644 --- a/examples/network/securesocketclient/sslclient.cpp +++ b/examples/network/securesocketclient/sslclient.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/securesocketclient/sslclient.h b/examples/network/securesocketclient/sslclient.h index efc3569743..5653785bbd 100644 --- a/examples/network/securesocketclient/sslclient.h +++ b/examples/network/securesocketclient/sslclient.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/threadedfortuneserver/dialog.cpp b/examples/network/threadedfortuneserver/dialog.cpp index 08d62fa06b..00be68de45 100644 --- a/examples/network/threadedfortuneserver/dialog.cpp +++ b/examples/network/threadedfortuneserver/dialog.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/threadedfortuneserver/dialog.h b/examples/network/threadedfortuneserver/dialog.h index 922875ec37..4a630ac6bd 100644 --- a/examples/network/threadedfortuneserver/dialog.h +++ b/examples/network/threadedfortuneserver/dialog.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/threadedfortuneserver/fortuneserver.cpp b/examples/network/threadedfortuneserver/fortuneserver.cpp index d7e31d2e76..cd81ea14bb 100644 --- a/examples/network/threadedfortuneserver/fortuneserver.cpp +++ b/examples/network/threadedfortuneserver/fortuneserver.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/threadedfortuneserver/fortuneserver.h b/examples/network/threadedfortuneserver/fortuneserver.h index c49b9058f4..c9cd734173 100644 --- a/examples/network/threadedfortuneserver/fortuneserver.h +++ b/examples/network/threadedfortuneserver/fortuneserver.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/threadedfortuneserver/fortunethread.cpp b/examples/network/threadedfortuneserver/fortunethread.cpp index 6f2b210c93..ab65f5a862 100644 --- a/examples/network/threadedfortuneserver/fortunethread.cpp +++ b/examples/network/threadedfortuneserver/fortunethread.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/threadedfortuneserver/fortunethread.h b/examples/network/threadedfortuneserver/fortunethread.h index 569d35aef8..361ccea2b0 100644 --- a/examples/network/threadedfortuneserver/fortunethread.h +++ b/examples/network/threadedfortuneserver/fortunethread.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/threadedfortuneserver/main.cpp b/examples/network/threadedfortuneserver/main.cpp index c56f89a8ed..a7d1c800b8 100644 --- a/examples/network/threadedfortuneserver/main.cpp +++ b/examples/network/threadedfortuneserver/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/torrent/addtorrentdialog.cpp b/examples/network/torrent/addtorrentdialog.cpp index d168633df3..4c63d3293e 100644 --- a/examples/network/torrent/addtorrentdialog.cpp +++ b/examples/network/torrent/addtorrentdialog.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/torrent/addtorrentdialog.h b/examples/network/torrent/addtorrentdialog.h index 742736cdc9..2babeaf7d8 100644 --- a/examples/network/torrent/addtorrentdialog.h +++ b/examples/network/torrent/addtorrentdialog.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/torrent/bencodeparser.cpp b/examples/network/torrent/bencodeparser.cpp index 6ef7234539..3fc81b1787 100644 --- a/examples/network/torrent/bencodeparser.cpp +++ b/examples/network/torrent/bencodeparser.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/torrent/bencodeparser.h b/examples/network/torrent/bencodeparser.h index 5d3aeada04..190cc860a6 100644 --- a/examples/network/torrent/bencodeparser.h +++ b/examples/network/torrent/bencodeparser.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/torrent/connectionmanager.cpp b/examples/network/torrent/connectionmanager.cpp index 014085efb8..b21ed79394 100644 --- a/examples/network/torrent/connectionmanager.cpp +++ b/examples/network/torrent/connectionmanager.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/torrent/connectionmanager.h b/examples/network/torrent/connectionmanager.h index 11646a4659..76afb5c634 100644 --- a/examples/network/torrent/connectionmanager.h +++ b/examples/network/torrent/connectionmanager.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/torrent/filemanager.cpp b/examples/network/torrent/filemanager.cpp index ed970b2b82..5337a46313 100644 --- a/examples/network/torrent/filemanager.cpp +++ b/examples/network/torrent/filemanager.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/torrent/filemanager.h b/examples/network/torrent/filemanager.h index 81b0321ae5..9c9fec69e4 100644 --- a/examples/network/torrent/filemanager.h +++ b/examples/network/torrent/filemanager.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/torrent/main.cpp b/examples/network/torrent/main.cpp index 9cdca69122..c992ab75fe 100644 --- a/examples/network/torrent/main.cpp +++ b/examples/network/torrent/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/torrent/mainwindow.cpp b/examples/network/torrent/mainwindow.cpp index fe7bbdaf3b..0b493fb42b 100644 --- a/examples/network/torrent/mainwindow.cpp +++ b/examples/network/torrent/mainwindow.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/torrent/mainwindow.h b/examples/network/torrent/mainwindow.h index 1862d857ff..c7417d8016 100644 --- a/examples/network/torrent/mainwindow.h +++ b/examples/network/torrent/mainwindow.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/torrent/metainfo.cpp b/examples/network/torrent/metainfo.cpp index bed7e7c09f..43e7b4f533 100644 --- a/examples/network/torrent/metainfo.cpp +++ b/examples/network/torrent/metainfo.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/torrent/metainfo.h b/examples/network/torrent/metainfo.h index 17daca559e..eb5052b28d 100644 --- a/examples/network/torrent/metainfo.h +++ b/examples/network/torrent/metainfo.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/torrent/peerwireclient.cpp b/examples/network/torrent/peerwireclient.cpp index 2b5fe3ada1..2cf1bfbe8a 100644 --- a/examples/network/torrent/peerwireclient.cpp +++ b/examples/network/torrent/peerwireclient.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/torrent/peerwireclient.h b/examples/network/torrent/peerwireclient.h index 12ce0696f6..1c5a6907dc 100644 --- a/examples/network/torrent/peerwireclient.h +++ b/examples/network/torrent/peerwireclient.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/torrent/ratecontroller.cpp b/examples/network/torrent/ratecontroller.cpp index 4841c6d5e9..03bde3c9e4 100644 --- a/examples/network/torrent/ratecontroller.cpp +++ b/examples/network/torrent/ratecontroller.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/torrent/ratecontroller.h b/examples/network/torrent/ratecontroller.h index de79148d8f..cde2068379 100644 --- a/examples/network/torrent/ratecontroller.h +++ b/examples/network/torrent/ratecontroller.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/torrent/torrentclient.cpp b/examples/network/torrent/torrentclient.cpp index 356dc21a1f..acdfd976be 100644 --- a/examples/network/torrent/torrentclient.cpp +++ b/examples/network/torrent/torrentclient.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/torrent/torrentclient.h b/examples/network/torrent/torrentclient.h index ef9c99aea1..d2636a39fd 100644 --- a/examples/network/torrent/torrentclient.h +++ b/examples/network/torrent/torrentclient.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/torrent/torrentserver.cpp b/examples/network/torrent/torrentserver.cpp index 0a9d836098..8320267522 100644 --- a/examples/network/torrent/torrentserver.cpp +++ b/examples/network/torrent/torrentserver.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/torrent/torrentserver.h b/examples/network/torrent/torrentserver.h index 0f1be50c5b..e5de4a8641 100644 --- a/examples/network/torrent/torrentserver.h +++ b/examples/network/torrent/torrentserver.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/torrent/trackerclient.cpp b/examples/network/torrent/trackerclient.cpp index fef3c7d596..e23c0f9195 100644 --- a/examples/network/torrent/trackerclient.cpp +++ b/examples/network/torrent/trackerclient.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/network/torrent/trackerclient.h b/examples/network/torrent/trackerclient.h index da8b457b0f..4c0fb847ba 100644 --- a/examples/network/torrent/trackerclient.h +++ b/examples/network/torrent/trackerclient.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/2dpainting/glwidget.cpp b/examples/opengl/2dpainting/glwidget.cpp index 5e040ae347..148678fbfe 100644 --- a/examples/opengl/2dpainting/glwidget.cpp +++ b/examples/opengl/2dpainting/glwidget.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/2dpainting/glwidget.h b/examples/opengl/2dpainting/glwidget.h index 07b279117c..711fdf0ada 100644 --- a/examples/opengl/2dpainting/glwidget.h +++ b/examples/opengl/2dpainting/glwidget.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/2dpainting/helper.cpp b/examples/opengl/2dpainting/helper.cpp index a07266a6e5..0b6cc978de 100644 --- a/examples/opengl/2dpainting/helper.cpp +++ b/examples/opengl/2dpainting/helper.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/2dpainting/helper.h b/examples/opengl/2dpainting/helper.h index ec8dad1e7b..6e614405bc 100644 --- a/examples/opengl/2dpainting/helper.h +++ b/examples/opengl/2dpainting/helper.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/2dpainting/main.cpp b/examples/opengl/2dpainting/main.cpp index fb3454b1cd..cd13244c2f 100644 --- a/examples/opengl/2dpainting/main.cpp +++ b/examples/opengl/2dpainting/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/2dpainting/widget.cpp b/examples/opengl/2dpainting/widget.cpp index edfff5ba79..2f17246e83 100644 --- a/examples/opengl/2dpainting/widget.cpp +++ b/examples/opengl/2dpainting/widget.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/2dpainting/widget.h b/examples/opengl/2dpainting/widget.h index 9e2602e73c..7b50623413 100644 --- a/examples/opengl/2dpainting/widget.h +++ b/examples/opengl/2dpainting/widget.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/2dpainting/window.cpp b/examples/opengl/2dpainting/window.cpp index 3525577220..c35a02d5ec 100644 --- a/examples/opengl/2dpainting/window.cpp +++ b/examples/opengl/2dpainting/window.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/2dpainting/window.h b/examples/opengl/2dpainting/window.h index 82571b60cb..316d4d633c 100644 --- a/examples/opengl/2dpainting/window.h +++ b/examples/opengl/2dpainting/window.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/contextinfo/main.cpp b/examples/opengl/contextinfo/main.cpp index bc6363b31a..d21fe9d9d8 100644 --- a/examples/opengl/contextinfo/main.cpp +++ b/examples/opengl/contextinfo/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/contextinfo/renderwindow.cpp b/examples/opengl/contextinfo/renderwindow.cpp index af51de1d67..4ade76dcc7 100644 --- a/examples/opengl/contextinfo/renderwindow.cpp +++ b/examples/opengl/contextinfo/renderwindow.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/contextinfo/renderwindow.h b/examples/opengl/contextinfo/renderwindow.h index 36b15fd22b..d0c71778a4 100644 --- a/examples/opengl/contextinfo/renderwindow.h +++ b/examples/opengl/contextinfo/renderwindow.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/contextinfo/widget.cpp b/examples/opengl/contextinfo/widget.cpp index 4ab62ec2d2..2ef6073d00 100644 --- a/examples/opengl/contextinfo/widget.cpp +++ b/examples/opengl/contextinfo/widget.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/contextinfo/widget.h b/examples/opengl/contextinfo/widget.h index ad664178e4..eb5f264fd3 100644 --- a/examples/opengl/contextinfo/widget.h +++ b/examples/opengl/contextinfo/widget.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/cube/geometryengine.cpp b/examples/opengl/cube/geometryengine.cpp index 618a080c37..00c4220b4a 100644 --- a/examples/opengl/cube/geometryengine.cpp +++ b/examples/opengl/cube/geometryengine.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/cube/geometryengine.h b/examples/opengl/cube/geometryengine.h index 0b51ebf5f2..bd13ed5d1b 100644 --- a/examples/opengl/cube/geometryengine.h +++ b/examples/opengl/cube/geometryengine.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/cube/main.cpp b/examples/opengl/cube/main.cpp index 73363da016..25ef6589f0 100644 --- a/examples/opengl/cube/main.cpp +++ b/examples/opengl/cube/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/cube/mainwidget.cpp b/examples/opengl/cube/mainwidget.cpp index b5a7a972d1..da09384c66 100644 --- a/examples/opengl/cube/mainwidget.cpp +++ b/examples/opengl/cube/mainwidget.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/cube/mainwidget.h b/examples/opengl/cube/mainwidget.h index 8aff8f7714..315346d944 100644 --- a/examples/opengl/cube/mainwidget.h +++ b/examples/opengl/cube/mainwidget.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/doc/src/2dpainting.qdoc b/examples/opengl/doc/src/2dpainting.qdoc index 9bd6e5dea0..ce1312d40b 100644 --- a/examples/opengl/doc/src/2dpainting.qdoc +++ b/examples/opengl/doc/src/2dpainting.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/opengl/doc/src/cube.qdoc b/examples/opengl/doc/src/cube.qdoc index 23c15f9c43..185e2aab85 100644 --- a/examples/opengl/doc/src/cube.qdoc +++ b/examples/opengl/doc/src/cube.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/opengl/doc/src/hellogl2.qdoc b/examples/opengl/doc/src/hellogl2.qdoc index adaf9d4719..1466b539eb 100644 --- a/examples/opengl/doc/src/hellogl2.qdoc +++ b/examples/opengl/doc/src/hellogl2.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/opengl/doc/src/textures.qdoc b/examples/opengl/doc/src/textures.qdoc index d63ac274c0..54bb3a0d57 100644 --- a/examples/opengl/doc/src/textures.qdoc +++ b/examples/opengl/doc/src/textures.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/opengl/hellogl2/glwidget.cpp b/examples/opengl/hellogl2/glwidget.cpp index 7764fa8dfc..e146adf106 100644 --- a/examples/opengl/hellogl2/glwidget.cpp +++ b/examples/opengl/hellogl2/glwidget.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/hellogl2/glwidget.h b/examples/opengl/hellogl2/glwidget.h index 2d642649f1..46c17f3e51 100644 --- a/examples/opengl/hellogl2/glwidget.h +++ b/examples/opengl/hellogl2/glwidget.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/hellogl2/logo.cpp b/examples/opengl/hellogl2/logo.cpp index 1ba47ddfb5..82ecac5438 100644 --- a/examples/opengl/hellogl2/logo.cpp +++ b/examples/opengl/hellogl2/logo.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/hellogl2/logo.h b/examples/opengl/hellogl2/logo.h index 29bb7fa241..53c60e827a 100644 --- a/examples/opengl/hellogl2/logo.h +++ b/examples/opengl/hellogl2/logo.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/hellogl2/main.cpp b/examples/opengl/hellogl2/main.cpp index 2d439878e4..4454068036 100644 --- a/examples/opengl/hellogl2/main.cpp +++ b/examples/opengl/hellogl2/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/hellogl2/mainwindow.cpp b/examples/opengl/hellogl2/mainwindow.cpp index ee85cda35c..2029b8129e 100644 --- a/examples/opengl/hellogl2/mainwindow.cpp +++ b/examples/opengl/hellogl2/mainwindow.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/hellogl2/mainwindow.h b/examples/opengl/hellogl2/mainwindow.h index 53d4555ce8..0e8bdbcb3e 100644 --- a/examples/opengl/hellogl2/mainwindow.h +++ b/examples/opengl/hellogl2/mainwindow.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/hellogl2/window.cpp b/examples/opengl/hellogl2/window.cpp index 0b20870487..470699538d 100644 --- a/examples/opengl/hellogl2/window.cpp +++ b/examples/opengl/hellogl2/window.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/hellogl2/window.h b/examples/opengl/hellogl2/window.h index a850bd6a5a..4046e0907b 100644 --- a/examples/opengl/hellogl2/window.h +++ b/examples/opengl/hellogl2/window.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/hellowindow/hellowindow.cpp b/examples/opengl/hellowindow/hellowindow.cpp index ac5bfea280..e179d9f119 100644 --- a/examples/opengl/hellowindow/hellowindow.cpp +++ b/examples/opengl/hellowindow/hellowindow.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/hellowindow/hellowindow.h b/examples/opengl/hellowindow/hellowindow.h index cba4b34db6..a8278a134e 100644 --- a/examples/opengl/hellowindow/hellowindow.h +++ b/examples/opengl/hellowindow/hellowindow.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/hellowindow/main.cpp b/examples/opengl/hellowindow/main.cpp index e7ad9722c2..f2f0afd1c2 100644 --- a/examples/opengl/hellowindow/main.cpp +++ b/examples/opengl/hellowindow/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/legacy/framebufferobject2/glwidget.cpp b/examples/opengl/legacy/framebufferobject2/glwidget.cpp index 32b9799a4a..b41eb642c4 100644 --- a/examples/opengl/legacy/framebufferobject2/glwidget.cpp +++ b/examples/opengl/legacy/framebufferobject2/glwidget.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/legacy/framebufferobject2/glwidget.h b/examples/opengl/legacy/framebufferobject2/glwidget.h index 2991a4fdf2..8842f78f45 100644 --- a/examples/opengl/legacy/framebufferobject2/glwidget.h +++ b/examples/opengl/legacy/framebufferobject2/glwidget.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/legacy/framebufferobject2/main.cpp b/examples/opengl/legacy/framebufferobject2/main.cpp index 4c9aa9840f..6c576cf27b 100644 --- a/examples/opengl/legacy/framebufferobject2/main.cpp +++ b/examples/opengl/legacy/framebufferobject2/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/legacy/grabber/glwidget.cpp b/examples/opengl/legacy/grabber/glwidget.cpp index abe3a8540a..f5c803246d 100644 --- a/examples/opengl/legacy/grabber/glwidget.cpp +++ b/examples/opengl/legacy/grabber/glwidget.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/legacy/grabber/glwidget.h b/examples/opengl/legacy/grabber/glwidget.h index 12071be173..5fe43ded91 100644 --- a/examples/opengl/legacy/grabber/glwidget.h +++ b/examples/opengl/legacy/grabber/glwidget.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/legacy/grabber/main.cpp b/examples/opengl/legacy/grabber/main.cpp index 145e4120ef..b8bd186541 100644 --- a/examples/opengl/legacy/grabber/main.cpp +++ b/examples/opengl/legacy/grabber/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/legacy/grabber/mainwindow.cpp b/examples/opengl/legacy/grabber/mainwindow.cpp index 9f82ee10ba..deb2433251 100644 --- a/examples/opengl/legacy/grabber/mainwindow.cpp +++ b/examples/opengl/legacy/grabber/mainwindow.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/legacy/grabber/mainwindow.h b/examples/opengl/legacy/grabber/mainwindow.h index a7895bf4c4..8ea9b6fb81 100644 --- a/examples/opengl/legacy/grabber/mainwindow.h +++ b/examples/opengl/legacy/grabber/mainwindow.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/legacy/hellogl/glwidget.cpp b/examples/opengl/legacy/hellogl/glwidget.cpp index 3a9faaca5f..fa1c3fb250 100644 --- a/examples/opengl/legacy/hellogl/glwidget.cpp +++ b/examples/opengl/legacy/hellogl/glwidget.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/legacy/hellogl/glwidget.h b/examples/opengl/legacy/hellogl/glwidget.h index 0989be1dc6..d996ddd87c 100644 --- a/examples/opengl/legacy/hellogl/glwidget.h +++ b/examples/opengl/legacy/hellogl/glwidget.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/legacy/hellogl/main.cpp b/examples/opengl/legacy/hellogl/main.cpp index 2e83a11e95..9623364502 100644 --- a/examples/opengl/legacy/hellogl/main.cpp +++ b/examples/opengl/legacy/hellogl/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/legacy/hellogl/window.cpp b/examples/opengl/legacy/hellogl/window.cpp index 2a85bbec57..1d9e4b3abc 100644 --- a/examples/opengl/legacy/hellogl/window.cpp +++ b/examples/opengl/legacy/hellogl/window.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/legacy/hellogl/window.h b/examples/opengl/legacy/hellogl/window.h index 900e6b13fc..bd360028ef 100644 --- a/examples/opengl/legacy/hellogl/window.h +++ b/examples/opengl/legacy/hellogl/window.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/legacy/overpainting/bubble.cpp b/examples/opengl/legacy/overpainting/bubble.cpp index dbcb72bc93..9d543e39c5 100644 --- a/examples/opengl/legacy/overpainting/bubble.cpp +++ b/examples/opengl/legacy/overpainting/bubble.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/legacy/overpainting/bubble.h b/examples/opengl/legacy/overpainting/bubble.h index 10d24b8af7..d30b6ea46d 100644 --- a/examples/opengl/legacy/overpainting/bubble.h +++ b/examples/opengl/legacy/overpainting/bubble.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/legacy/overpainting/glwidget.cpp b/examples/opengl/legacy/overpainting/glwidget.cpp index 420ae3e881..f4991191b8 100644 --- a/examples/opengl/legacy/overpainting/glwidget.cpp +++ b/examples/opengl/legacy/overpainting/glwidget.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/legacy/overpainting/glwidget.h b/examples/opengl/legacy/overpainting/glwidget.h index 1d1d48458d..5337cab8b9 100644 --- a/examples/opengl/legacy/overpainting/glwidget.h +++ b/examples/opengl/legacy/overpainting/glwidget.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/legacy/overpainting/main.cpp b/examples/opengl/legacy/overpainting/main.cpp index 57c520b528..fb3458c91b 100644 --- a/examples/opengl/legacy/overpainting/main.cpp +++ b/examples/opengl/legacy/overpainting/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/legacy/pbuffers/cube.cpp b/examples/opengl/legacy/pbuffers/cube.cpp index dc1bb23fea..3870a1e545 100644 --- a/examples/opengl/legacy/pbuffers/cube.cpp +++ b/examples/opengl/legacy/pbuffers/cube.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/legacy/pbuffers/cube.h b/examples/opengl/legacy/pbuffers/cube.h index 05017cb376..4e31801887 100644 --- a/examples/opengl/legacy/pbuffers/cube.h +++ b/examples/opengl/legacy/pbuffers/cube.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/legacy/pbuffers/glwidget.cpp b/examples/opengl/legacy/pbuffers/glwidget.cpp index b319951ccd..fc261c1e55 100644 --- a/examples/opengl/legacy/pbuffers/glwidget.cpp +++ b/examples/opengl/legacy/pbuffers/glwidget.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/legacy/pbuffers/glwidget.h b/examples/opengl/legacy/pbuffers/glwidget.h index 1d23b7772a..2171900d15 100644 --- a/examples/opengl/legacy/pbuffers/glwidget.h +++ b/examples/opengl/legacy/pbuffers/glwidget.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/legacy/pbuffers/main.cpp b/examples/opengl/legacy/pbuffers/main.cpp index 8be6640e92..8ee5573dab 100644 --- a/examples/opengl/legacy/pbuffers/main.cpp +++ b/examples/opengl/legacy/pbuffers/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/legacy/pbuffers2/glwidget.cpp b/examples/opengl/legacy/pbuffers2/glwidget.cpp index de30bb8b21..c2d5ac577c 100644 --- a/examples/opengl/legacy/pbuffers2/glwidget.cpp +++ b/examples/opengl/legacy/pbuffers2/glwidget.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/legacy/pbuffers2/glwidget.h b/examples/opengl/legacy/pbuffers2/glwidget.h index 20dd796a48..1c7aa92083 100644 --- a/examples/opengl/legacy/pbuffers2/glwidget.h +++ b/examples/opengl/legacy/pbuffers2/glwidget.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/legacy/pbuffers2/main.cpp b/examples/opengl/legacy/pbuffers2/main.cpp index 79fd88a3c8..fb82a80573 100644 --- a/examples/opengl/legacy/pbuffers2/main.cpp +++ b/examples/opengl/legacy/pbuffers2/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/legacy/samplebuffers/glwidget.cpp b/examples/opengl/legacy/samplebuffers/glwidget.cpp index 28abf3d6c0..050e82135d 100644 --- a/examples/opengl/legacy/samplebuffers/glwidget.cpp +++ b/examples/opengl/legacy/samplebuffers/glwidget.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/legacy/samplebuffers/glwidget.h b/examples/opengl/legacy/samplebuffers/glwidget.h index 494c5861df..568e6f7868 100644 --- a/examples/opengl/legacy/samplebuffers/glwidget.h +++ b/examples/opengl/legacy/samplebuffers/glwidget.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/legacy/samplebuffers/main.cpp b/examples/opengl/legacy/samplebuffers/main.cpp index a1272af4db..fc59bd1993 100644 --- a/examples/opengl/legacy/samplebuffers/main.cpp +++ b/examples/opengl/legacy/samplebuffers/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/legacy/shared/qtlogo.cpp b/examples/opengl/legacy/shared/qtlogo.cpp index 608f5b3f2b..d0168ae337 100644 --- a/examples/opengl/legacy/shared/qtlogo.cpp +++ b/examples/opengl/legacy/shared/qtlogo.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/legacy/shared/qtlogo.h b/examples/opengl/legacy/shared/qtlogo.h index 5508372b01..ff54ee24d3 100644 --- a/examples/opengl/legacy/shared/qtlogo.h +++ b/examples/opengl/legacy/shared/qtlogo.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/paintedwindow/main.cpp b/examples/opengl/paintedwindow/main.cpp index b2e3cf796f..f331f5c3a6 100644 --- a/examples/opengl/paintedwindow/main.cpp +++ b/examples/opengl/paintedwindow/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/paintedwindow/paintedwindow.cpp b/examples/opengl/paintedwindow/paintedwindow.cpp index d44b6308b3..840a0ed717 100644 --- a/examples/opengl/paintedwindow/paintedwindow.cpp +++ b/examples/opengl/paintedwindow/paintedwindow.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/paintedwindow/paintedwindow.h b/examples/opengl/paintedwindow/paintedwindow.h index 140af6db4d..66c65e5f05 100644 --- a/examples/opengl/paintedwindow/paintedwindow.h +++ b/examples/opengl/paintedwindow/paintedwindow.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/qopenglwidget/bubble.cpp b/examples/opengl/qopenglwidget/bubble.cpp index c78e26a1d4..11219e0241 100644 --- a/examples/opengl/qopenglwidget/bubble.cpp +++ b/examples/opengl/qopenglwidget/bubble.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/qopenglwidget/bubble.h b/examples/opengl/qopenglwidget/bubble.h index ea33466ef7..4f4ce9a910 100644 --- a/examples/opengl/qopenglwidget/bubble.h +++ b/examples/opengl/qopenglwidget/bubble.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/qopenglwidget/glwidget.cpp b/examples/opengl/qopenglwidget/glwidget.cpp index d39e1992a7..d28899634e 100644 --- a/examples/opengl/qopenglwidget/glwidget.cpp +++ b/examples/opengl/qopenglwidget/glwidget.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** - ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). - ** Contact: http://www.qt-project.org/legal + ** Copyright (C) 2015 The Qt Company Ltd. + ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. - ** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names - ** of its contributors may be used to endorse or promote products derived - ** from this software without specific prior written permission. + ** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/qopenglwidget/glwidget.h b/examples/opengl/qopenglwidget/glwidget.h index ba8317df4a..c45d0e2b83 100644 --- a/examples/opengl/qopenglwidget/glwidget.h +++ b/examples/opengl/qopenglwidget/glwidget.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/qopenglwidget/main.cpp b/examples/opengl/qopenglwidget/main.cpp index a545c27249..0e7a13b6e1 100644 --- a/examples/opengl/qopenglwidget/main.cpp +++ b/examples/opengl/qopenglwidget/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/qopenglwidget/mainwindow.cpp b/examples/opengl/qopenglwidget/mainwindow.cpp index a3c8d5edcf..b4c7854340 100644 --- a/examples/opengl/qopenglwidget/mainwindow.cpp +++ b/examples/opengl/qopenglwidget/mainwindow.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/qopenglwidget/mainwindow.h b/examples/opengl/qopenglwidget/mainwindow.h index 353586c42c..b3730f5d4f 100644 --- a/examples/opengl/qopenglwidget/mainwindow.h +++ b/examples/opengl/qopenglwidget/mainwindow.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/qopenglwindow/background_renderer.cpp b/examples/opengl/qopenglwindow/background_renderer.cpp index 01807866d4..cb6de0f904 100644 --- a/examples/opengl/qopenglwindow/background_renderer.cpp +++ b/examples/opengl/qopenglwindow/background_renderer.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/qopenglwindow/background_renderer.h b/examples/opengl/qopenglwindow/background_renderer.h index 3759de478c..ba645a79d9 100644 --- a/examples/opengl/qopenglwindow/background_renderer.h +++ b/examples/opengl/qopenglwindow/background_renderer.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/qopenglwindow/main.cpp b/examples/opengl/qopenglwindow/main.cpp index 996feb5e96..67068020ad 100644 --- a/examples/opengl/qopenglwindow/main.cpp +++ b/examples/opengl/qopenglwindow/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/textures/glwidget.cpp b/examples/opengl/textures/glwidget.cpp index 96c732f8a6..c0170b3b35 100644 --- a/examples/opengl/textures/glwidget.cpp +++ b/examples/opengl/textures/glwidget.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/textures/glwidget.h b/examples/opengl/textures/glwidget.h index eb47266e64..51421a70e3 100644 --- a/examples/opengl/textures/glwidget.h +++ b/examples/opengl/textures/glwidget.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/textures/main.cpp b/examples/opengl/textures/main.cpp index 30b0bfa607..ca713c511f 100644 --- a/examples/opengl/textures/main.cpp +++ b/examples/opengl/textures/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/textures/window.cpp b/examples/opengl/textures/window.cpp index 8876de5602..ebf4ee49d8 100644 --- a/examples/opengl/textures/window.cpp +++ b/examples/opengl/textures/window.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/textures/window.h b/examples/opengl/textures/window.h index 0b53387024..7dfdffb895 100644 --- a/examples/opengl/textures/window.h +++ b/examples/opengl/textures/window.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/threadedqopenglwidget/glwidget.cpp b/examples/opengl/threadedqopenglwidget/glwidget.cpp index ecf1287045..aadf2a38d0 100644 --- a/examples/opengl/threadedqopenglwidget/glwidget.cpp +++ b/examples/opengl/threadedqopenglwidget/glwidget.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/threadedqopenglwidget/glwidget.h b/examples/opengl/threadedqopenglwidget/glwidget.h index c063e846dc..66f085b4d4 100644 --- a/examples/opengl/threadedqopenglwidget/glwidget.h +++ b/examples/opengl/threadedqopenglwidget/glwidget.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/threadedqopenglwidget/main.cpp b/examples/opengl/threadedqopenglwidget/main.cpp index 66ee4c2f7f..5c64b9c287 100644 --- a/examples/opengl/threadedqopenglwidget/main.cpp +++ b/examples/opengl/threadedqopenglwidget/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/threadedqopenglwidget/mainwindow.cpp b/examples/opengl/threadedqopenglwidget/mainwindow.cpp index de866f5615..2f2f115d69 100644 --- a/examples/opengl/threadedqopenglwidget/mainwindow.cpp +++ b/examples/opengl/threadedqopenglwidget/mainwindow.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/opengl/threadedqopenglwidget/mainwindow.h b/examples/opengl/threadedqopenglwidget/mainwindow.h index 91f7580717..b9f46c5254 100644 --- a/examples/opengl/threadedqopenglwidget/mainwindow.h +++ b/examples/opengl/threadedqopenglwidget/mainwindow.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/qmake/precompile/main.cpp b/examples/qmake/precompile/main.cpp index d6dc803dfd..ed29d2bf1b 100644 --- a/examples/qmake/precompile/main.cpp +++ b/examples/qmake/precompile/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/qmake/precompile/mydialog.cpp b/examples/qmake/precompile/mydialog.cpp index 66fee407cf..9860e4345b 100644 --- a/examples/qmake/precompile/mydialog.cpp +++ b/examples/qmake/precompile/mydialog.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/qmake/precompile/mydialog.h b/examples/qmake/precompile/mydialog.h index e3eef8ff05..8f2fdc418a 100644 --- a/examples/qmake/precompile/mydialog.h +++ b/examples/qmake/precompile/mydialog.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/qmake/precompile/myobject.cpp b/examples/qmake/precompile/myobject.cpp index a9ad50245e..2b3568d901 100644 --- a/examples/qmake/precompile/myobject.cpp +++ b/examples/qmake/precompile/myobject.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/qmake/precompile/myobject.h b/examples/qmake/precompile/myobject.h index 510bb791eb..2e2257228d 100644 --- a/examples/qmake/precompile/myobject.h +++ b/examples/qmake/precompile/myobject.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/qmake/precompile/stable.h b/examples/qmake/precompile/stable.h index eef8cef728..f9b33b4f5c 100644 --- a/examples/qmake/precompile/stable.h +++ b/examples/qmake/precompile/stable.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/qmake/precompile/util.cpp b/examples/qmake/precompile/util.cpp index c59a720282..ef75902407 100644 --- a/examples/qmake/precompile/util.cpp +++ b/examples/qmake/precompile/util.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/qmake/tutorial/hello.cpp b/examples/qmake/tutorial/hello.cpp index 1d79b13fab..fd29d6208a 100644 --- a/examples/qmake/tutorial/hello.cpp +++ b/examples/qmake/tutorial/hello.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/qmake/tutorial/hello.h b/examples/qmake/tutorial/hello.h index 384445c512..85eb757f08 100644 --- a/examples/qmake/tutorial/hello.h +++ b/examples/qmake/tutorial/hello.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/qmake/tutorial/hellounix.cpp b/examples/qmake/tutorial/hellounix.cpp index fd2d57ecc6..b4b30bd1fc 100644 --- a/examples/qmake/tutorial/hellounix.cpp +++ b/examples/qmake/tutorial/hellounix.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/qmake/tutorial/hellowin.cpp b/examples/qmake/tutorial/hellowin.cpp index bee4095122..9396f55f8c 100644 --- a/examples/qmake/tutorial/hellowin.cpp +++ b/examples/qmake/tutorial/hellowin.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/qmake/tutorial/main.cpp b/examples/qmake/tutorial/main.cpp index 25cf51e8f5..ade8d476b5 100644 --- a/examples/qmake/tutorial/main.cpp +++ b/examples/qmake/tutorial/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/qpa/qrasterwindow/main.cpp b/examples/qpa/qrasterwindow/main.cpp index 0e87d41682..594644772b 100644 --- a/examples/qpa/qrasterwindow/main.cpp +++ b/examples/qpa/qrasterwindow/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** - ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). - ** Contact: http://www.qt-project.org/legal + ** Copyright (C) 2015 The Qt Company Ltd. + ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. - ** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names - ** of its contributors may be used to endorse or promote products derived - ** from this software without specific prior written permission. + ** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/qpa/windows/main.cpp b/examples/qpa/windows/main.cpp index f8761096b0..556b280b24 100644 --- a/examples/qpa/windows/main.cpp +++ b/examples/qpa/windows/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/qpa/windows/window.cpp b/examples/qpa/windows/window.cpp index 793257feeb..a34b062dbd 100644 --- a/examples/qpa/windows/window.cpp +++ b/examples/qpa/windows/window.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/qpa/windows/window.h b/examples/qpa/windows/window.h index f9abfc0821..319840f8e2 100644 --- a/examples/qpa/windows/window.h +++ b/examples/qpa/windows/window.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/qtconcurrent/imagescaling/doc/src/qtconcurrent-imagescaling.qdoc b/examples/qtconcurrent/imagescaling/doc/src/qtconcurrent-imagescaling.qdoc index 6d7c39526d..46eeed12ad 100644 --- a/examples/qtconcurrent/imagescaling/doc/src/qtconcurrent-imagescaling.qdoc +++ b/examples/qtconcurrent/imagescaling/doc/src/qtconcurrent-imagescaling.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/qtconcurrent/imagescaling/imagescaling.cpp b/examples/qtconcurrent/imagescaling/imagescaling.cpp index 9cc8ef655d..d4ac621a36 100644 --- a/examples/qtconcurrent/imagescaling/imagescaling.cpp +++ b/examples/qtconcurrent/imagescaling/imagescaling.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/qtconcurrent/imagescaling/imagescaling.h b/examples/qtconcurrent/imagescaling/imagescaling.h index a84e2bdb6d..2bf278fe7e 100644 --- a/examples/qtconcurrent/imagescaling/imagescaling.h +++ b/examples/qtconcurrent/imagescaling/imagescaling.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/qtconcurrent/imagescaling/main.cpp b/examples/qtconcurrent/imagescaling/main.cpp index 442c8a4771..351fc9419e 100644 --- a/examples/qtconcurrent/imagescaling/main.cpp +++ b/examples/qtconcurrent/imagescaling/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/qtconcurrent/map/doc/src/qtconcurrent-map.qdoc b/examples/qtconcurrent/map/doc/src/qtconcurrent-map.qdoc index 43c27bd98f..666790a47e 100644 --- a/examples/qtconcurrent/map/doc/src/qtconcurrent-map.qdoc +++ b/examples/qtconcurrent/map/doc/src/qtconcurrent-map.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/qtconcurrent/map/main.cpp b/examples/qtconcurrent/map/main.cpp index cec07dad66..6556aa81eb 100644 --- a/examples/qtconcurrent/map/main.cpp +++ b/examples/qtconcurrent/map/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/qtconcurrent/progressdialog/doc/src/qtconcurrent-progressdialog.qdoc b/examples/qtconcurrent/progressdialog/doc/src/qtconcurrent-progressdialog.qdoc index 109bb73bdb..3a537c5320 100644 --- a/examples/qtconcurrent/progressdialog/doc/src/qtconcurrent-progressdialog.qdoc +++ b/examples/qtconcurrent/progressdialog/doc/src/qtconcurrent-progressdialog.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/qtconcurrent/progressdialog/main.cpp b/examples/qtconcurrent/progressdialog/main.cpp index 01d4aef256..79ef306de4 100644 --- a/examples/qtconcurrent/progressdialog/main.cpp +++ b/examples/qtconcurrent/progressdialog/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/qtconcurrent/runfunction/doc/src/qtconcurrent-runfunction.qdoc b/examples/qtconcurrent/runfunction/doc/src/qtconcurrent-runfunction.qdoc index 0f36dcbd6d..277629803d 100644 --- a/examples/qtconcurrent/runfunction/doc/src/qtconcurrent-runfunction.qdoc +++ b/examples/qtconcurrent/runfunction/doc/src/qtconcurrent-runfunction.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/qtconcurrent/runfunction/main.cpp b/examples/qtconcurrent/runfunction/main.cpp index 85c5e1267a..3103ef8dce 100644 --- a/examples/qtconcurrent/runfunction/main.cpp +++ b/examples/qtconcurrent/runfunction/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/qtconcurrent/wordcount/doc/src/qtconcurrent-wordcount.qdoc b/examples/qtconcurrent/wordcount/doc/src/qtconcurrent-wordcount.qdoc index b45524ca7c..74f1dbdbb8 100644 --- a/examples/qtconcurrent/wordcount/doc/src/qtconcurrent-wordcount.qdoc +++ b/examples/qtconcurrent/wordcount/doc/src/qtconcurrent-wordcount.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/qtconcurrent/wordcount/main.cpp b/examples/qtconcurrent/wordcount/main.cpp index 408e92dbb3..d76c684c28 100644 --- a/examples/qtconcurrent/wordcount/main.cpp +++ b/examples/qtconcurrent/wordcount/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/qtestlib/tutorial1/testqstring.cpp b/examples/qtestlib/tutorial1/testqstring.cpp index 1389646e03..5e54eccb85 100644 --- a/examples/qtestlib/tutorial1/testqstring.cpp +++ b/examples/qtestlib/tutorial1/testqstring.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/qtestlib/tutorial2/testqstring.cpp b/examples/qtestlib/tutorial2/testqstring.cpp index 05c28be99e..7eab3b85c1 100644 --- a/examples/qtestlib/tutorial2/testqstring.cpp +++ b/examples/qtestlib/tutorial2/testqstring.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/qtestlib/tutorial3/testgui.cpp b/examples/qtestlib/tutorial3/testgui.cpp index c019ba48c2..5532ed3a84 100644 --- a/examples/qtestlib/tutorial3/testgui.cpp +++ b/examples/qtestlib/tutorial3/testgui.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/qtestlib/tutorial4/testgui.cpp b/examples/qtestlib/tutorial4/testgui.cpp index 8bdf97aad6..f430b0ffc2 100644 --- a/examples/qtestlib/tutorial4/testgui.cpp +++ b/examples/qtestlib/tutorial4/testgui.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/qtestlib/tutorial5/benchmarking.cpp b/examples/qtestlib/tutorial5/benchmarking.cpp index 55d25e8a36..117f61fbb3 100644 --- a/examples/qtestlib/tutorial5/benchmarking.cpp +++ b/examples/qtestlib/tutorial5/benchmarking.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/qtestlib/tutorial5/containers.cpp b/examples/qtestlib/tutorial5/containers.cpp index 59e094f818..1229cfdd34 100644 --- a/examples/qtestlib/tutorial5/containers.cpp +++ b/examples/qtestlib/tutorial5/containers.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the test suite of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/sql/books/bookdelegate.cpp b/examples/sql/books/bookdelegate.cpp index 0e3959015f..ff965eda44 100644 --- a/examples/sql/books/bookdelegate.cpp +++ b/examples/sql/books/bookdelegate.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the demonstration applications of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/examples/sql/books/bookdelegate.h b/examples/sql/books/bookdelegate.h index 46c827eaec..8cd1481490 100644 --- a/examples/sql/books/bookdelegate.h +++ b/examples/sql/books/bookdelegate.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the demonstration applications of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/examples/sql/books/bookwindow.cpp b/examples/sql/books/bookwindow.cpp index 3750b0bc4d..dd47ed0eeb 100644 --- a/examples/sql/books/bookwindow.cpp +++ b/examples/sql/books/bookwindow.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the demonstration applications of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/examples/sql/books/bookwindow.h b/examples/sql/books/bookwindow.h index 9a79b9a164..4110172f9c 100644 --- a/examples/sql/books/bookwindow.h +++ b/examples/sql/books/bookwindow.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the demonstration applications of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/examples/sql/books/initdb.h b/examples/sql/books/initdb.h index fb103fb491..7aa1e23c83 100644 --- a/examples/sql/books/initdb.h +++ b/examples/sql/books/initdb.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the demonstration applications of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/examples/sql/books/main.cpp b/examples/sql/books/main.cpp index 9568b8d94d..93f72c3327 100644 --- a/examples/sql/books/main.cpp +++ b/examples/sql/books/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the demonstration applications of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/examples/sql/cachedtable/main.cpp b/examples/sql/cachedtable/main.cpp index 6cc56ed8e2..f31a3b80c5 100644 --- a/examples/sql/cachedtable/main.cpp +++ b/examples/sql/cachedtable/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/sql/cachedtable/tableeditor.cpp b/examples/sql/cachedtable/tableeditor.cpp index 5f31866a44..fbec298d9a 100644 --- a/examples/sql/cachedtable/tableeditor.cpp +++ b/examples/sql/cachedtable/tableeditor.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/sql/cachedtable/tableeditor.h b/examples/sql/cachedtable/tableeditor.h index ba0d9788da..3618af911a 100644 --- a/examples/sql/cachedtable/tableeditor.h +++ b/examples/sql/cachedtable/tableeditor.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/sql/connection.h b/examples/sql/connection.h index e6bbe642cb..853acbcba0 100644 --- a/examples/sql/connection.h +++ b/examples/sql/connection.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/sql/doc/src/books.qdoc b/examples/sql/doc/src/books.qdoc index bfdee4e362..816641c35c 100644 --- a/examples/sql/doc/src/books.qdoc +++ b/examples/sql/doc/src/books.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/sql/doc/src/cachedtable.qdoc b/examples/sql/doc/src/cachedtable.qdoc index efa97fa679..e718d56f34 100644 --- a/examples/sql/doc/src/cachedtable.qdoc +++ b/examples/sql/doc/src/cachedtable.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/sql/doc/src/drilldown.qdoc b/examples/sql/doc/src/drilldown.qdoc index 09f9477f4f..261c059b31 100644 --- a/examples/sql/doc/src/drilldown.qdoc +++ b/examples/sql/doc/src/drilldown.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/sql/doc/src/masterdetail.qdoc b/examples/sql/doc/src/masterdetail.qdoc index abf2624844..3a8c49bbc5 100644 --- a/examples/sql/doc/src/masterdetail.qdoc +++ b/examples/sql/doc/src/masterdetail.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/sql/doc/src/querymodel.qdoc b/examples/sql/doc/src/querymodel.qdoc index b25cc745e3..a75bf8d37e 100644 --- a/examples/sql/doc/src/querymodel.qdoc +++ b/examples/sql/doc/src/querymodel.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/sql/doc/src/relationaltablemodel.qdoc b/examples/sql/doc/src/relationaltablemodel.qdoc index 36fe7e2dfb..7b53565d80 100644 --- a/examples/sql/doc/src/relationaltablemodel.qdoc +++ b/examples/sql/doc/src/relationaltablemodel.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/sql/doc/src/sqlbrowser.qdoc b/examples/sql/doc/src/sqlbrowser.qdoc index 51733da990..fd6c81c803 100644 --- a/examples/sql/doc/src/sqlbrowser.qdoc +++ b/examples/sql/doc/src/sqlbrowser.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/sql/doc/src/sqlwidgetmapper.qdoc b/examples/sql/doc/src/sqlwidgetmapper.qdoc index 649c5af24d..ae084e0133 100644 --- a/examples/sql/doc/src/sqlwidgetmapper.qdoc +++ b/examples/sql/doc/src/sqlwidgetmapper.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/sql/doc/src/tablemodel.qdoc b/examples/sql/doc/src/tablemodel.qdoc index be1fb6b488..13f80fd3d3 100644 --- a/examples/sql/doc/src/tablemodel.qdoc +++ b/examples/sql/doc/src/tablemodel.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/sql/drilldown/imageitem.cpp b/examples/sql/drilldown/imageitem.cpp index f1e3872e1c..0606b18a4d 100644 --- a/examples/sql/drilldown/imageitem.cpp +++ b/examples/sql/drilldown/imageitem.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/sql/drilldown/imageitem.h b/examples/sql/drilldown/imageitem.h index 3935c157a7..0886ee7a58 100644 --- a/examples/sql/drilldown/imageitem.h +++ b/examples/sql/drilldown/imageitem.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/sql/drilldown/informationwindow.cpp b/examples/sql/drilldown/informationwindow.cpp index d3930c6f0b..1f29b50cf9 100644 --- a/examples/sql/drilldown/informationwindow.cpp +++ b/examples/sql/drilldown/informationwindow.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/sql/drilldown/informationwindow.h b/examples/sql/drilldown/informationwindow.h index f039e120ca..154ae338c3 100644 --- a/examples/sql/drilldown/informationwindow.h +++ b/examples/sql/drilldown/informationwindow.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/sql/drilldown/main.cpp b/examples/sql/drilldown/main.cpp index 956cca9ef9..a8c19dfa7f 100644 --- a/examples/sql/drilldown/main.cpp +++ b/examples/sql/drilldown/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/sql/drilldown/view.cpp b/examples/sql/drilldown/view.cpp index a64252cbd2..76220632f9 100644 --- a/examples/sql/drilldown/view.cpp +++ b/examples/sql/drilldown/view.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/sql/drilldown/view.h b/examples/sql/drilldown/view.h index b7fb72fe74..9f0f457abe 100644 --- a/examples/sql/drilldown/view.h +++ b/examples/sql/drilldown/view.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/sql/masterdetail/database.h b/examples/sql/masterdetail/database.h index 4ba083fe24..2e9460cf05 100644 --- a/examples/sql/masterdetail/database.h +++ b/examples/sql/masterdetail/database.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/sql/masterdetail/dialog.cpp b/examples/sql/masterdetail/dialog.cpp index 47ca11b0f6..46159e3567 100644 --- a/examples/sql/masterdetail/dialog.cpp +++ b/examples/sql/masterdetail/dialog.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/sql/masterdetail/dialog.h b/examples/sql/masterdetail/dialog.h index b0b351a7f2..fe8aea750e 100644 --- a/examples/sql/masterdetail/dialog.h +++ b/examples/sql/masterdetail/dialog.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/sql/masterdetail/main.cpp b/examples/sql/masterdetail/main.cpp index a9e1796c79..e13bdb6bff 100644 --- a/examples/sql/masterdetail/main.cpp +++ b/examples/sql/masterdetail/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/sql/masterdetail/mainwindow.cpp b/examples/sql/masterdetail/mainwindow.cpp index ee42a22d00..cfa784e14d 100644 --- a/examples/sql/masterdetail/mainwindow.cpp +++ b/examples/sql/masterdetail/mainwindow.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/sql/masterdetail/mainwindow.h b/examples/sql/masterdetail/mainwindow.h index 2ae4a77eda..30a17fd871 100644 --- a/examples/sql/masterdetail/mainwindow.h +++ b/examples/sql/masterdetail/mainwindow.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/sql/querymodel/customsqlmodel.cpp b/examples/sql/querymodel/customsqlmodel.cpp index 23984e15a5..54c1038655 100644 --- a/examples/sql/querymodel/customsqlmodel.cpp +++ b/examples/sql/querymodel/customsqlmodel.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/sql/querymodel/customsqlmodel.h b/examples/sql/querymodel/customsqlmodel.h index ec673305a8..57dbac448c 100644 --- a/examples/sql/querymodel/customsqlmodel.h +++ b/examples/sql/querymodel/customsqlmodel.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/sql/querymodel/editablesqlmodel.cpp b/examples/sql/querymodel/editablesqlmodel.cpp index 3aeb7b665a..364c4526df 100644 --- a/examples/sql/querymodel/editablesqlmodel.cpp +++ b/examples/sql/querymodel/editablesqlmodel.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/sql/querymodel/editablesqlmodel.h b/examples/sql/querymodel/editablesqlmodel.h index a1f3f1a302..a86a30868a 100644 --- a/examples/sql/querymodel/editablesqlmodel.h +++ b/examples/sql/querymodel/editablesqlmodel.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/sql/querymodel/main.cpp b/examples/sql/querymodel/main.cpp index 66024ddf98..706ce4f388 100644 --- a/examples/sql/querymodel/main.cpp +++ b/examples/sql/querymodel/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/sql/relationaltablemodel/relationaltablemodel.cpp b/examples/sql/relationaltablemodel/relationaltablemodel.cpp index 6481c11a03..e3e9c47666 100644 --- a/examples/sql/relationaltablemodel/relationaltablemodel.cpp +++ b/examples/sql/relationaltablemodel/relationaltablemodel.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/sql/sqlbrowser/browser.cpp b/examples/sql/sqlbrowser/browser.cpp index 7e7204e9a1..69c9614c52 100644 --- a/examples/sql/sqlbrowser/browser.cpp +++ b/examples/sql/sqlbrowser/browser.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the demonstration applications of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/examples/sql/sqlbrowser/browser.h b/examples/sql/sqlbrowser/browser.h index 92c7be8b94..e505af6605 100644 --- a/examples/sql/sqlbrowser/browser.h +++ b/examples/sql/sqlbrowser/browser.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the demonstration applications of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/examples/sql/sqlbrowser/connectionwidget.cpp b/examples/sql/sqlbrowser/connectionwidget.cpp index b625a8bdf8..378c5fdb21 100644 --- a/examples/sql/sqlbrowser/connectionwidget.cpp +++ b/examples/sql/sqlbrowser/connectionwidget.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the demonstration applications of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/examples/sql/sqlbrowser/connectionwidget.h b/examples/sql/sqlbrowser/connectionwidget.h index fede5b6cf1..290119eca9 100644 --- a/examples/sql/sqlbrowser/connectionwidget.h +++ b/examples/sql/sqlbrowser/connectionwidget.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the demonstration applications of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/examples/sql/sqlbrowser/main.cpp b/examples/sql/sqlbrowser/main.cpp index 2733d23783..1d52ccf819 100644 --- a/examples/sql/sqlbrowser/main.cpp +++ b/examples/sql/sqlbrowser/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the demonstration applications of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/examples/sql/sqlbrowser/qsqlconnectiondialog.cpp b/examples/sql/sqlbrowser/qsqlconnectiondialog.cpp index 55b10793ba..a4645c6a83 100644 --- a/examples/sql/sqlbrowser/qsqlconnectiondialog.cpp +++ b/examples/sql/sqlbrowser/qsqlconnectiondialog.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the demonstration applications of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/examples/sql/sqlbrowser/qsqlconnectiondialog.h b/examples/sql/sqlbrowser/qsqlconnectiondialog.h index a761683bd1..47bf6af01b 100644 --- a/examples/sql/sqlbrowser/qsqlconnectiondialog.h +++ b/examples/sql/sqlbrowser/qsqlconnectiondialog.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the demonstration applications of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ diff --git a/examples/sql/sqlwidgetmapper/main.cpp b/examples/sql/sqlwidgetmapper/main.cpp index 28f1dbaed1..1f753c19cd 100644 --- a/examples/sql/sqlwidgetmapper/main.cpp +++ b/examples/sql/sqlwidgetmapper/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/sql/sqlwidgetmapper/window.cpp b/examples/sql/sqlwidgetmapper/window.cpp index 3fa8d17827..30ca34fe91 100644 --- a/examples/sql/sqlwidgetmapper/window.cpp +++ b/examples/sql/sqlwidgetmapper/window.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/sql/sqlwidgetmapper/window.h b/examples/sql/sqlwidgetmapper/window.h index fca908a6e9..954890b276 100644 --- a/examples/sql/sqlwidgetmapper/window.h +++ b/examples/sql/sqlwidgetmapper/window.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/sql/tablemodel/tablemodel.cpp b/examples/sql/tablemodel/tablemodel.cpp index f86b904090..fd612baffa 100644 --- a/examples/sql/tablemodel/tablemodel.cpp +++ b/examples/sql/tablemodel/tablemodel.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/touch/dials/doc/src/touch-dials.qdoc b/examples/touch/dials/doc/src/touch-dials.qdoc index 592caed383..bf01f8bf6f 100644 --- a/examples/touch/dials/doc/src/touch-dials.qdoc +++ b/examples/touch/dials/doc/src/touch-dials.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/touch/dials/main.cpp b/examples/touch/dials/main.cpp index eef7f5f65a..8561ba42dd 100644 --- a/examples/touch/dials/main.cpp +++ b/examples/touch/dials/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtGui module of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/touch/fingerpaint/main.cpp b/examples/touch/fingerpaint/main.cpp index 62ea1e6e33..96666988f9 100644 --- a/examples/touch/fingerpaint/main.cpp +++ b/examples/touch/fingerpaint/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/touch/fingerpaint/mainwindow.cpp b/examples/touch/fingerpaint/mainwindow.cpp index f0477011d3..67a36f23dc 100644 --- a/examples/touch/fingerpaint/mainwindow.cpp +++ b/examples/touch/fingerpaint/mainwindow.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/touch/fingerpaint/mainwindow.h b/examples/touch/fingerpaint/mainwindow.h index 997ea064f2..707cd26af6 100644 --- a/examples/touch/fingerpaint/mainwindow.h +++ b/examples/touch/fingerpaint/mainwindow.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/touch/fingerpaint/scribblearea.cpp b/examples/touch/fingerpaint/scribblearea.cpp index 1630f6f112..3da8d5f42a 100644 --- a/examples/touch/fingerpaint/scribblearea.cpp +++ b/examples/touch/fingerpaint/scribblearea.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/touch/fingerpaint/scribblearea.h b/examples/touch/fingerpaint/scribblearea.h index 2019bfc58f..b3a80f862a 100644 --- a/examples/touch/fingerpaint/scribblearea.h +++ b/examples/touch/fingerpaint/scribblearea.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/touch/knobs/doc/src/touch-knobs.qdoc b/examples/touch/knobs/doc/src/touch-knobs.qdoc index 039f8d3f8c..640dd744c8 100644 --- a/examples/touch/knobs/doc/src/touch-knobs.qdoc +++ b/examples/touch/knobs/doc/src/touch-knobs.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 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 +** 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. ** $QT_END_LICENSE$ diff --git a/examples/touch/knobs/knob.cpp b/examples/touch/knobs/knob.cpp index f0ae65e38c..f3fae03f26 100644 --- a/examples/touch/knobs/knob.cpp +++ b/examples/touch/knobs/knob.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/touch/knobs/knob.h b/examples/touch/knobs/knob.h index a3315a9b1d..e198884239 100644 --- a/examples/touch/knobs/knob.h +++ b/examples/touch/knobs/knob.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/touch/knobs/main.cpp b/examples/touch/knobs/main.cpp index 018ca336da..58c223a6e3 100644 --- a/examples/touch/knobs/main.cpp +++ b/examples/touch/knobs/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/touch/pinchzoom/graphicsview.cpp b/examples/touch/pinchzoom/graphicsview.cpp index 494fe16eec..45622c1d4f 100644 --- a/examples/touch/pinchzoom/graphicsview.cpp +++ b/examples/touch/pinchzoom/graphicsview.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/touch/pinchzoom/graphicsview.h b/examples/touch/pinchzoom/graphicsview.h index 63728acaf6..d98965a1cd 100644 --- a/examples/touch/pinchzoom/graphicsview.h +++ b/examples/touch/pinchzoom/graphicsview.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/touch/pinchzoom/main.cpp b/examples/touch/pinchzoom/main.cpp index de44512b7d..b9cac781c1 100644 --- a/examples/touch/pinchzoom/main.cpp +++ b/examples/touch/pinchzoom/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/touch/pinchzoom/mouse.cpp b/examples/touch/pinchzoom/mouse.cpp index 40e6ccb127..59950f9158 100644 --- a/examples/touch/pinchzoom/mouse.cpp +++ b/examples/touch/pinchzoom/mouse.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/touch/pinchzoom/mouse.h b/examples/touch/pinchzoom/mouse.h index 9a705e5062..aaeb1f8147 100644 --- a/examples/touch/pinchzoom/mouse.h +++ b/examples/touch/pinchzoom/mouse.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,9 +17,9 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/webkit/webkit-guide/_copyright.txt b/examples/webkit/webkit-guide/_copyright.txt index b90716cf3a..6dab10c23f 100644 --- a/examples/webkit/webkit-guide/_copyright.txt +++ b/examples/webkit/webkit-guide/_copyright.txt @@ -2,8 +2,8 @@ This file is part of QtWebKit -Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). -Contact: http://www.qt-project.org/legal +Copyright (c) 2015 The Qt Company Ltd. +Contact: http://www.qt.io/licensing/ You may use this file under the terms of the BSD license as follows: @@ -19,10 +19,9 @@ o 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. -o Neither the name of Digia Plc and its Subsidiary(-ies) nor - the names of its contributors may be used to endorse or promote - products derived from this software without specific prior written - permission. +o Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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 diff --git a/examples/webkit/webkit-guide/_image_assets.htm b/examples/webkit/webkit-guide/_image_assets.htm index c9b7a49039..98715e1416 100644 --- a/examples/webkit/webkit-guide/_image_assets.htm +++ b/examples/webkit/webkit-guide/_image_assets.htm @@ -1,7 +1,7 @@