diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-05 12:13:56 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-05 12:13:56 +0100 |
| commit | 719dd0dd2721739f51f0cc711f42f176e74e8529 (patch) | |
| tree | cbc58e3e8e2786631d741b0d5a94f685b12b2fe3 /src/imports/controls/material/qquickmaterialprogressring.cpp | |
| parent | 1c7daa22ebfb4682e18c8afb911e8c784127ade3 (diff) | |
| parent | 408eb756d0a429c7b9c8189b7475b0ddfaa7a21e (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: Ifca1c4f4f6d243d2a8c693b71fbea3bf49634c2e
Diffstat (limited to 'src/imports/controls/material/qquickmaterialprogressring.cpp')
| -rw-r--r-- | src/imports/controls/material/qquickmaterialprogressring.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/imports/controls/material/qquickmaterialprogressring.cpp b/src/imports/controls/material/qquickmaterialprogressring.cpp index 9953266d..7f7ed114 100644 --- a/src/imports/controls/material/qquickmaterialprogressring.cpp +++ b/src/imports/controls/material/qquickmaterialprogressring.cpp @@ -274,7 +274,4 @@ void QQuickMaterialRingTexture::setColor(QColor color) m_color = color; } -Q_DECLARE_TYPEINFO(QQuickMaterialRingAnimatorJob, Q_COMPLEX_TYPE); -Q_DECLARE_TYPEINFO(QQuickMaterialRingTexture, Q_COMPLEX_TYPE); - QT_END_NAMESPACE |