diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-12-17 16:52:50 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-12-17 16:52:50 +0100 |
| commit | 974f84c7f50d7fd1628137845c51df3d3a80b3fe (patch) | |
| tree | 4ee6e0128deed899b52dda956e97bdebfe7e5c2f /src/effects/LinearGradient.qml | |
| parent | 9a5ee9b9449f4046c8c9e690714d1d5f74ec0b51 (diff) | |
| parent | e9e740ef4778dffe9b5dbd1d6abdd94517fdb2fb (diff) | |
| download | qtgraphicaleffects-974f84c7f50d7fd1628137845c51df3d3a80b3fe.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
Change-Id: Ie64aa3089d47063e82f8d1cb77929deee86c62ea
Diffstat (limited to 'src/effects/LinearGradient.qml')
| -rw-r--r-- | src/effects/LinearGradient.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/effects/LinearGradient.qml b/src/effects/LinearGradient.qml index b5845ea..6b6324a 100644 --- a/src/effects/LinearGradient.qml +++ b/src/effects/LinearGradient.qml @@ -43,7 +43,7 @@ import "private" /*! \qmltype LinearGradient - \inqmlmodule QtGraphicalEffects 1.0 + \inqmlmodule QtGraphicalEffects \since QtGraphicalEffects 1.0 \inherits QtQuick2::Item \ingroup qtgraphicaleffects-gradient |