diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-17 17:13:17 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-17 17:13:17 +0100 |
| commit | 47109a1ed7bf0a8b6341bc0f1ed5409f7658e96d (patch) | |
| tree | 2c87834a97817ccb4f60abf5c4d6eace58a6387f | |
| parent | 713e1b66e35e08bd05b5ed0684665d068366ff7f (diff) | |
| parent | a65e88aa4eeccb3e6e3d1888d5e2e866487c851f (diff) | |
| download | qtgraphicaleffects-47109a1ed7bf0a8b6341bc0f1ed5409f7658e96d.tar.gz qtgraphicaleffects-47109a1ed7bf0a8b6341bc0f1ed5409f7658e96d.tar.bz2 qtgraphicaleffects-47109a1ed7bf0a8b6341bc0f1ed5409f7658e96d.zip | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
Change-Id: I81e166011a25fca9f883937fa9ebf7fbee09e9b9
| -rw-r--r-- | src/effects/doc/qtgraphicaleffects.qdocconf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/effects/doc/qtgraphicaleffects.qdocconf b/src/effects/doc/qtgraphicaleffects.qdocconf index bb521a5..1b60dde 100644 --- a/src/effects/doc/qtgraphicaleffects.qdocconf +++ b/src/effects/doc/qtgraphicaleffects.qdocconf @@ -37,7 +37,7 @@ exampledirs += ../../../examples/graphicaleffects \ imagedirs += images -depends += qtqml qtquick qtbase qtdoc qtcore +depends += qtqml qtquick qtdoc qtcore navigation.landingpage = "Qt Graphical Effects" navigation.qmltypespage = "Graphical Effects" |