diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-03-13 14:04:34 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-03-25 10:33:52 +0100 |
| commit | 11939c8856e5d27ef1b6f025c89a0ff1683075c0 (patch) | |
| tree | e73699a05405c25b0a23c86677276b65fbd70014 /src/imports | |
| parent | d5d42a24b5b9d2079d584defac70aef1a1feadef (diff) | |
Update qtbase dependency
- Adapt to QOpenGLWidgets split
- Use new Q_MOC_INCLUDE directive where required
- Fix QtConcurrent usage
Change-Id: I9de650ae4fbbd397ef4fd4650c8aa5a0443d566f
Reviewed-by: Vitaly Fanaskov <vitaly.fanaskov@qt.io>
Diffstat (limited to 'src/imports')
4 files changed, 8 insertions, 0 deletions
diff --git a/src/imports/audioengine/qdeclarative_audioengine_p.h b/src/imports/audioengine/qdeclarative_audioengine_p.h index fd049e629..d770dc00c 100644 --- a/src/imports/audioengine/qdeclarative_audioengine_p.h +++ b/src/imports/audioengine/qdeclarative_audioengine_p.h @@ -59,6 +59,8 @@ #include <QTimer> #include "qaudioengine_p.h" +Q_MOC_INCLUDE("qdeclarative_audiolistener_p.h") + QT_BEGIN_NAMESPACE class QDeclarativeSoundInstance; diff --git a/src/imports/audioengine/qdeclarative_audiolistener_p.h b/src/imports/audioengine/qdeclarative_audiolistener_p.h index 31f831ab3..05c29e245 100644 --- a/src/imports/audioengine/qdeclarative_audiolistener_p.h +++ b/src/imports/audioengine/qdeclarative_audiolistener_p.h @@ -54,6 +54,8 @@ #include <QtCore/QObject> #include <QtGui/qvector3d.h> +Q_MOC_INCLUDE("qdeclarative_audioengine_p.h") + QT_BEGIN_NAMESPACE class QDeclarativeAudioEngine; diff --git a/src/imports/audioengine/qdeclarative_soundinstance_p.h b/src/imports/audioengine/qdeclarative_soundinstance_p.h index df3cd8bd9..962c2ae63 100644 --- a/src/imports/audioengine/qdeclarative_soundinstance_p.h +++ b/src/imports/audioengine/qdeclarative_soundinstance_p.h @@ -55,6 +55,8 @@ #include <QtGui/qvector3d.h> #include "qsoundinstance_p.h" +Q_MOC_INCLUDE("qdeclarative_audioengine_p.h") + QT_BEGIN_NAMESPACE class QDeclarativeSound; diff --git a/src/imports/multimedia/qdeclarativeradio_p.h b/src/imports/multimedia/qdeclarativeradio_p.h index fd95a7f17..b1dc4e6d9 100644 --- a/src/imports/multimedia/qdeclarativeradio_p.h +++ b/src/imports/multimedia/qdeclarativeradio_p.h @@ -54,6 +54,8 @@ #include <qradiotuner.h> #include <QtQml/qqml.h> +Q_MOC_INCLUDE("qdeclarativeradiodata_p.h") + QT_BEGIN_NAMESPACE class QDeclarativeRadioData; |