diff options
| author | Gunnar Sletta <gunnar.sletta@digia.com> | 2013-02-05 09:17:39 +0100 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@digia.com> | 2013-02-05 09:18:13 +0100 |
| commit | b4ac3d733eae9cfcf929f3ae4a50fc20d24dc808 (patch) | |
| tree | 952f5521f21022a762293436312bad89ff18da86 /src | |
| parent | 0bd009dfadb2e2187b29ebd27a6e6fdf8ff89c66 (diff) | |
| parent | 17626e935cbb477f93fc43082af5744731614e3a (diff) | |
| download | qtgraphicaleffects-b4ac3d733eae9cfcf929f3ae4a50fc20d24dc808.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I550ba62203b0a5c4020181330185e77781dc76af
Diffstat (limited to 'src')
| -rw-r--r-- | src/effects/doc/qtgraphicaleffects.qdocconf | 4 | ||||
| -rw-r--r-- | src/effects/private/SourceProxy.qml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/effects/doc/qtgraphicaleffects.qdocconf b/src/effects/doc/qtgraphicaleffects.qdocconf index 4d75fd9..3be69c1 100644 --- a/src/effects/doc/qtgraphicaleffects.qdocconf +++ b/src/effects/doc/qtgraphicaleffects.qdocconf @@ -8,7 +8,7 @@ version = 5.0.1 qhp.projects = QtGraphicalEffects qhp.QtGraphicalEffects.file = qtgraphicaleffects.qhp -qhp.QtGraphicalEffects.namespace = org.qt-project.qtgraphicaleffects.500 +qhp.QtGraphicalEffects.namespace = org.qt-project.qtgraphicaleffects.501 qhp.QtGraphicalEffects.virtualFolder = qtgraphicaleffects qhp.QtGraphicalEffects.indexTitle = Qt Graphical Effects qhp.QtGraphicalEffects.indexRoot = @@ -20,7 +20,7 @@ qhp.QtGraphicalEffects.customFilters.Qt.filterAttributes = qtgraphicaleffects 5. qhp.QtGraphicalEffects.subprojects = qmltypes qhp.QtGraphicalEffects.subprojects.qmltypes.title = QML Types qhp.QtGraphicalEffects.subprojects.qmltypes.indexTitle = Graphical Effects -qhp.QtGraphicalEffects.subprojects.qmltypes.selectors = class fake:headerfile +qhp.QtGraphicalEffects.subprojects.qmltypes.selectors = fake:qmlclass qhp.QtGraphicalEffects.subprojects.qmltypes.sortPages = true outputdir = $$QT_INSTALL_DOCS/qtgraphicaleffects diff --git a/src/effects/private/SourceProxy.qml b/src/effects/private/SourceProxy.qml index ef60a3e..2561d70 100644 --- a/src/effects/private/SourceProxy.qml +++ b/src/effects/private/SourceProxy.qml @@ -43,7 +43,7 @@ import QtQuick 2.0 Item { id: rootItem property variant input - property variant output: input + property variant output property variant sourceRect visible: false |