diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2016-11-17 16:24:33 +0100 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2016-11-17 16:24:33 +0100 |
| commit | 0beb79fb0e9ed814b3e9447ccd97a0c099af9e4b (patch) | |
| tree | 28f7411dc50f099ef0812c830525b4f50ed7ecf4 /src/quick/items/qquickitem_p.h | |
| parent | 12a3eff085bc7eb30a5283e32009d2899b464278 (diff) | |
| parent | a7fd83cd0cecb789006baecabfc6a49c49b7f48c (diff) | |
Merge branch remote-tracking branch 'origin/dev' into wip/pointerhandler
We no longer have any hope of getting this into 5.8.
Change-Id: I2decfa47e589ba7ae2d6b951c6517a2c311d0192
Diffstat (limited to 'src/quick/items/qquickitem_p.h')
| -rw-r--r-- | src/quick/items/qquickitem_p.h | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/quick/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h index 5fa6de546f..49d0949fb8 100644 --- a/src/quick/items/qquickitem_p.h +++ b/src/quick/items/qquickitem_p.h @@ -76,7 +76,9 @@ #include <QtCore/qdebug.h> #include <QtCore/qelapsedtimer.h> +#if QT_CONFIG(quick_shadereffect) #include <QtQuick/private/qquickshadereffectsource_p.h> +#endif QT_BEGIN_NAMESPACE @@ -136,6 +138,7 @@ public: QList<QQuickItem *> items; }; +#if QT_CONFIG(quick_shadereffect) class QQuickItemLayer : public QObject, public QQuickItemChangeListener { @@ -237,6 +240,8 @@ private: QQuickShaderEffectSource::TextureMirroring m_textureMirroring; }; +#endif + class Q_QUICK_PRIVATE_EXPORT QQuickItemPrivate : public QObjectPrivate { Q_DECLARE_PUBLIC(QQuickItem) @@ -301,6 +306,7 @@ public: void _q_resourceObjectDeleted(QObject *); void _q_windowChanged(QQuickWindow *w); + quint64 _q_createJSWrapper(QV4::ExecutionEngine *engine); enum ChangeType { Geometry = 0x01, @@ -340,7 +346,9 @@ public: QQuickEnterKeyAttached *enterKeyAttached; QQuickItemKeyFilter *keyHandler; QVector<QQuickPointerHandler *> pointerHandlers; +#if QT_CONFIG(quick_shadereffect) mutable QQuickItemLayer *layer; +#endif #ifndef QT_NO_CURSOR QCursor cursor; #endif @@ -597,9 +605,6 @@ public: void setHasCursorInChild(bool hasCursor); void setHasHoverInChild(bool hasHover); - // recursive helper to let a visual parent mark its visual children - void markObjects(QV4::ExecutionEngine *e); - virtual void updatePolish() { } }; @@ -860,9 +865,9 @@ private: void inputMethodEvent(QInputMethodEvent *, bool post) Q_DECL_OVERRIDE; QVariant inputMethodQuery(Qt::InputMethodQuery query) const Q_DECL_OVERRIDE; #endif - const QByteArray keyToSignal(int key); + static QByteArray keyToSignal(int key); - bool isConnected(const char *signalName); + bool isConnected(const char *signalName) const; }; Qt::MouseButtons QQuickItemPrivate::acceptedMouseButtons() const @@ -929,7 +934,9 @@ Q_DECLARE_TYPEINFO(QQuickItemPrivate::ChangeListener, Q_PRIMITIVE_TYPE); QT_END_NAMESPACE +#if QT_CONFIG(quick_shadereffect) QML_DECLARE_TYPE(QQuickItemLayer) +#endif QML_DECLARE_TYPE(QQuickKeysAttached) QML_DECLARE_TYPEINFO(QQuickKeysAttached, QML_HAS_ATTACHED_PROPERTIES) QML_DECLARE_TYPE(QQuickKeyNavigationAttached) |