diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-31 08:24:21 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-31 08:24:21 +0200 |
| commit | f510a51dace0cb39a93b057b8fcbcbdda33a956e (patch) | |
| tree | cd1dac8a78ecbb7579c59bf9f0b0d2d6fba56b4a /src/gui/painting/qregion.cpp | |
| parent | ccedc853a67da078ace234af7b23fbf861736f3f (diff) | |
| parent | 84830fc07d65d58fce9b24b5ec8f1224b0969ac0 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: I843994939f126ced22f7fe978ec4403f599fc7c9
Diffstat (limited to 'src/gui/painting/qregion.cpp')
| -rw-r--r-- | src/gui/painting/qregion.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qregion.cpp b/src/gui/painting/qregion.cpp index 1ba6345bf9..0571e1a328 100644 --- a/src/gui/painting/qregion.cpp +++ b/src/gui/painting/qregion.cpp @@ -89,7 +89,7 @@ QT_BEGIN_NAMESPACE \section1 Additional License Information - On Embedded Linux, Windows CE and X11 platforms, parts of this class rely on + On Embedded Linux and X11 platforms, parts of this class rely on code obtained under the following licenses: \legalese |