Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Introduce layerering support (ShaderEffectSource) directly in Item
This is enabled by doing "Item.layer.enabled: true". The implementation
is solely based on the existing shader effect (source) and simply
swaps in a sibling next to the item when enabled.

This change also adds the QSGTextureProvider to the public API,
as it is now a natural part of the QQuickItem API since all items
can be textures.

Change-Id: I26705c11e92d5623a5121300acc123782b784077
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
  • Loading branch information
Gunnar Sletta authored and Qt by Nokia committed Jan 3, 2012
1 parent a9b103d commit 42d6acd
Show file tree
Hide file tree
Showing 27 changed files with 1,158 additions and 36 deletions.
2 changes: 1 addition & 1 deletion src/quick/items/qquickimage.cpp
Expand Up @@ -42,7 +42,7 @@
#include "qquickimage_p.h"
#include "qquickimage_p_p.h"

#include <QtQuick/private/qsgtextureprovider_p.h>
#include <QtQuick/qsgtextureprovider.h>

#include <QtQuick/private/qsgcontext_p.h>
#include <private/qsgadaptationlayer_p.h>
Expand Down
2 changes: 1 addition & 1 deletion src/quick/items/qquickimage_p.h
Expand Up @@ -44,7 +44,7 @@
#define QQUICKIMAGE_P_H

#include "qquickimagebase_p.h"
#include <QtQuick/private/qsgtextureprovider_p.h>
#include <QtQuick/qsgtextureprovider.h>

QT_BEGIN_HEADER

Expand Down

0 comments on commit 42d6acd

Please sign in to comment.