diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-06-30 10:33:27 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-06-30 10:33:27 +0200 |
| commit | 310ac6b0584875303ec5eab603b60320277ff598 (patch) | |
| tree | 963c4378f1c277c8b0a438596c4b99453dbaf568 /src/windeployqt/main.cpp | |
| parent | 38e5f27de587e6c9cc3b2844af792289afcd2d07 (diff) | |
| parent | fd797fc9441261d0679d60b0af3682966c862875 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/androiddeployqt/main.cpp
Change-Id: I3df907e197b1b976f74562f1a9cce10261f166f3
Diffstat (limited to 'src/windeployqt/main.cpp')
| -rw-r--r-- | src/windeployqt/main.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp index b7f11a962..dd58c9111 100644 --- a/src/windeployqt/main.cpp +++ b/src/windeployqt/main.cpp @@ -102,7 +102,8 @@ enum QtModule QtSerialBusModule = 0x0000800000000000, QtGamePadModule = 0x0001000000000000, Qt3DAnimationModule = 0x0002000000000000, - QtWebViewModule = 0x0004000000000000 + QtWebViewModule = 0x0004000000000000, + Qt3DExtrasModule = 0x0008000000000000 }; struct QtModuleEntry { @@ -159,6 +160,7 @@ static QtModuleEntry qtModuleEntries[] = { { Qt3DQuickRendererModule, "3dquickrenderer", "Qt53DQuickRender", 0 }, { Qt3DInputModule, "3dinput", "Qt53DInput", 0 }, { Qt3DAnimationModule, "3danimation", "Qt53DAnimation", 0 }, + { Qt3DExtrasModule, "3dextras", "Qt53DExtras", 0 }, { QtLocationModule, "geoservices", "Qt5Location", 0 }, { QtWebChannelModule, "webchannel", "Qt5WebChannel", 0 }, { QtTextToSpeechModule, "texttospeech", "Qt5TextToSpeech", 0 }, |