diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-04 09:36:08 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-04 09:36:14 +0200 |
| commit | 61afb4d02a9dde1c68d40cb9b50805bbf29b3c84 (patch) | |
| tree | efbbadb05e26d666a3122f70543e64a2acf0b9c8 /src/imports/multimedia | |
| parent | ef3d371e0f54030bed9a10c15d3c740f9dacc3bd (diff) | |
| parent | 64ddd6a4f57f4579bfd0eab91dc0f433c3a9f5f2 (diff) | |
Merge remote-tracking branch 'origin/wip/qt6' into dev
Conflicts:
.qmake.conf
Change-Id: I768ece1ea96b2d186484b72eafbc77c9ccfbb912
Diffstat (limited to 'src/imports/multimedia')
| -rw-r--r-- | src/imports/multimedia/multimedia.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp index 8aed83d33..5e3071f2b 100644 --- a/src/imports/multimedia/multimedia.cpp +++ b/src/imports/multimedia/multimedia.cpp @@ -160,8 +160,9 @@ public: // 5.13 types qmlRegisterType<QDeclarativeVideoOutput, 13>(uri, 5, 13, "VideoOutput"); - // Auto-increment the import to stay in sync with ALL future QtQuick minor versions from 5.11 onward - qmlRegisterModule(uri, 5, QT_VERSION_MINOR); + // The minor version used to be the current Qt 5 minor. For compatibility it is the last + // Qt 5 release. + qmlRegisterModule(uri, 5, 15); } void initializeEngine(QQmlEngine *engine, const char *uri) override |