diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-11-23 16:10:32 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-11-23 16:10:32 +0100 |
| commit | 4236abbd68560aef74fb70ecc2b0bc34d17cda7c (patch) | |
| tree | 74c452a1ea60d44437e2432d9d647d30235a79da /src/quicktemplates2/quicktemplates2.pri | |
| parent | 261e84c3e333574b300ea0b09f87fccc88c4a0ea (diff) | |
| parent | 9812a9cc1e71b0a3d8f25c0db2457f8673e53054 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/quicktemplates2/qquickswipedelegate_p.h
Change-Id: I5446503c1e4f21cb37f4fffeb3453d1c84b54b30
Diffstat (limited to 'src/quicktemplates2/quicktemplates2.pri')
| -rw-r--r-- | src/quicktemplates2/quicktemplates2.pri | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quicktemplates2/quicktemplates2.pri b/src/quicktemplates2/quicktemplates2.pri index 939d2f0e..4a128501 100644 --- a/src/quicktemplates2/quicktemplates2.pri +++ b/src/quicktemplates2/quicktemplates2.pri @@ -55,7 +55,9 @@ HEADERS += \ $$PWD/qquickspinbox_p.h \ $$PWD/qquickstackview_p.h \ $$PWD/qquickstackview_p_p.h \ + $$PWD/qquickswipe_p.h \ $$PWD/qquickswipedelegate_p.h \ + $$PWD/qquickswipedelegate_p_p.h \ $$PWD/qquickswipeview_p.h \ $$PWD/qquickswitch_p.h \ $$PWD/qquickswitchdelegate_p.h \ |