diff options
| author | Stephan Binner <stephan.binner@basyskom.com> | 2017-05-20 20:07:58 +0200 |
|---|---|---|
| committer | Stephan Binner <stephan.binner@basyskom.com> | 2017-05-29 10:46:50 +0000 |
| commit | 3945cf1f9aa3c4f43b995cc695cc3cfb5ec75c8c (patch) | |
| tree | 95bc8edabe371f343bcebd921ac19b024337165c /src/widgets/widgets/qlabel_p.h | |
| parent | 9ec028071409410dba192ec1c1e228cf3aea224b (diff) | |
Convert features.movie to QT_[REQUIRE_]CONFIG
Change-Id: I838c7305d4649f953c5bb972f1aa51dbb078afe2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/widgets/widgets/qlabel_p.h')
| -rw-r--r-- | src/widgets/widgets/qlabel_p.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/widgets/widgets/qlabel_p.h b/src/widgets/widgets/qlabel_p.h index d13c05fc99..f3236ac527 100644 --- a/src/widgets/widgets/qlabel_p.h +++ b/src/widgets/widgets/qlabel_p.h @@ -59,7 +59,9 @@ #include "qtextdocumentfragment.h" #include "qframe_p.h" #include "qtextdocument.h" +#if QT_CONFIG(movie) #include "qmovie.h" +#endif #include "qimage.h" #include "qbitmap.h" #include "qpicture.h" @@ -79,7 +81,7 @@ public: void updateLabel(); QSize sizeForWidth(int w) const; -#ifndef QT_NO_MOVIE +#if QT_CONFIG(movie) void _q_movieUpdated(const QRect&); void _q_movieResized(const QSize&); #endif @@ -116,7 +118,7 @@ public: #ifndef QT_NO_PICTURE QPicture *picture; #endif -#ifndef QT_NO_MOVIE +#if QT_CONFIG(movie) QPointer<QMovie> movie; #endif mutable QWidgetTextControl *control; |