diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-01-15 12:49:07 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-01-15 12:49:07 +0100 |
| commit | e8106ba7700e1666d1dbb3a9f1a579146dfdb681 (patch) | |
| tree | 2f22b1429b8b74c59649004db586114f3e12e128 /src/quicktemplates2/qquickcontrol_p_p.h | |
| parent | 589d52b3b64a4b5221738a28df08be2eae4d12b2 (diff) | |
| parent | d61567f3cfa100aeab865bd6b436de87970575f5 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/quicktemplates2/qquickcontrol.cpp
tests/auto/sanity/tst_sanity.cpp
Change-Id: I62a79fd7788fec635b9917fc91bacd7338b547fd
Diffstat (limited to 'src/quicktemplates2/qquickcontrol_p_p.h')
| -rw-r--r-- | src/quicktemplates2/qquickcontrol_p_p.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquickcontrol_p_p.h b/src/quicktemplates2/qquickcontrol_p_p.h index 3fe0a65b..7d040ded 100644 --- a/src/quicktemplates2/qquickcontrol_p_p.h +++ b/src/quicktemplates2/qquickcontrol_p_p.h @@ -146,8 +146,6 @@ public: virtual void cancelBackground(); virtual void executeBackground(bool complete = false); - static void destroyDelegate(QObject *object, QObject *parent); - struct ExtraData { ExtraData(); QFont requestedFont; |