aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickitem_p.h
Commit message (Expand)AuthorAgeFilesLines
* finish renaming of containsMask -> containmentMaskShawn Rutledge2018-02-281-1/+1
* use the override keyword consistently and correctly (clang-tidy)Shawn Rutledge2018-02-271-4/+4
* init variables where they are declared when possible (clang-tidy)Shawn Rutledge2018-02-261-13/+10
* use nullptr consistently (clang-tidy)Shawn Rutledge2018-02-261-15/+15
* Merge remote-tracking branch 'origin/5.10' into 5.11Liang Qi2018-02-121-0/+4
|\
| * Fix Shapes not playing well with QtGraphicalEffectsPaolo Angelelli2018-01-311-0/+4
* | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-02-021-1/+2
|\|
| * Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-241-1/+2
| |\
| | * Move setVisible into QQuickItemPrivatePaolo Angelelli2017-12-241-0/+2
| | * remove unimplemented QQuickItemPrivate::_q_windowChanged declarationShawn Rutledge2017-12-131-1/+0
* | | Support masking of QQuickItemsPaolo Angelelli2018-01-251-0/+7
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-061-0/+2
|\| |
| * | QQuickWindow: if an Item has PointerHandlers it's a delivery targetShawn Rutledge2017-10-171-0/+2
* | | Replace Q_NULLPTR with nullptrKevin Funk2017-09-271-1/+1
* | | Replace Q_DECL_OVERRIDE with overrideKevin Funk2017-09-251-16/+16
|/ /
* | Add QQuickItemPrivate::filterKeyEvent()J-P Nurmi2017-08-301-0/+1
* | Merge remote-tracking branch 'origin/dev' into wip/pointerhandlerShawn Rutledge2017-08-081-1/+2
|\ \
| * | Add QQuickItem::ItemEnabledHasChangedJ-P Nurmi2017-07-111-1/+2
* | | Merge remote-tracking branch 'origin/dev' into wip/pointerhandlerShawn Rutledge2017-05-081-5/+2
|\| |
| * | QQuickContents: Use QRectF rather than reinventing itRobin Burchell2017-04-171-5/+2
* | | Add QQuickItem acceptTouchEvents/setAcceptTouchEvents; require for touchShawn Rutledge2017-04-141-0/+1
* | | Merge remote-tracking branch 'origin/dev' into wip/pointerhandlerShawn Rutledge2017-03-021-0/+7
|\| |
| * | Add samples property for Item.layer and ShaderEffectSourceLaszlo Agocs2017-02-231-0/+7
| |/
* | clarify further exclusive vs. passive grabsShawn Rutledge2017-02-201-1/+1
* | QQuickWindow: deliver updates to handlers even if they don't grabShawn Rutledge2017-02-021-1/+1
* | Merge branch remote-tracking branch 'origin/dev' into wip/pointerhandlerShawn Rutledge2016-12-201-5/+9
|\|
| * Keys: add shortcutOverride signalMitch Curtis2016-12-181-0/+4
| * Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-12-141-5/+5
| |\
| | * Get rid of most QT_NO_FOO usagesLars Knoll2016-11-291-5/+5
* | | Merge branch remote-tracking branch 'origin/dev' into wip/pointerhandlerShawn Rutledge2016-11-171-5/+12
|\| |
| * | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-10-181-3/+10
| |\|
| | * Merge "Merge remote-tracking branch 'origin/5.7' into 5.8" into refs/staging/5.8Liang Qi2016-10-101-3/+1
| | |\
| | | * Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-10-101-3/+1
| | | |\
| | | | * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-10-041-3/+1
| | | | |\
| | | | | * Fix crash with window-less QQuickItemsSimon Hausmann2016-09-301-3/+1
| | * | | | Make shader effects configurableLars Knoll2016-10-101-0/+9
| | |/ / /
| * | | | Mark some methods as constAnton Kudryavtsev2016-10-061-1/+1
| * | | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-10-011-1/+0
| |\| | |
| * | | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-09-211-2/+0
| |\ \ \ \
| * | | | | QQuickKeysAttached: drop const from keyToSignal() result typeAnton Kudryavtsev2016-09-201-1/+1
* | | | | | Merge remote-tracking branch 'origin/5.8' into wip/pointerhandlerShawn Rutledge2016-10-071-1/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Remove unused notifier for parent accessorSimon Hausmann2016-09-271-1/+0
| | |/ / / | |/| | |
* | | | | Merge remote-tracking branch 'origin/5.8' into wip/pointerhandlerShawn Rutledge2016-08-301-2/+0
|\| | | |
| * | | | QML: Obliterate QQmlAccessorsErik Verbruggen2016-08-301-2/+0
| |/ / /
* / / / Introduce QQuickPointerHandler: base class for nested event handlersShawn Rutledge2016-08-151-0/+4
|/ / /
* | | QML: Pass the kind of geometry change aroundErik Verbruggen2016-07-111-19/+7
* | | Fix incorrect determination of cursor state in some casesRobin Burchell2016-07-071-1/+1
* | | Unify ShaderEffect property settingLaszlo Agocs2016-06-291-0/+2
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-211-3/+3
|\| |
| * | Fix QQuickItem change listenersJ-P Nurmi2016-05-241-3/+3