diff options
| -rw-r--r-- | examples/assistant/simpletextviewer/assistant.cpp | 5 | ||||
| -rw-r--r-- | examples/assistant/simpletextviewer/assistant.h | 3 | ||||
| -rw-r--r-- | src/windeployqt/main.cpp | 4 | ||||
| -rw-r--r-- | src/winrtrunner/appxlocalengine.cpp | 2 |
4 files changed, 9 insertions, 5 deletions
diff --git a/examples/assistant/simpletextviewer/assistant.cpp b/examples/assistant/simpletextviewer/assistant.cpp index 9e668bb7f..58103c14a 100644 --- a/examples/assistant/simpletextviewer/assistant.cpp +++ b/examples/assistant/simpletextviewer/assistant.cpp @@ -108,8 +108,9 @@ bool Assistant::startAssistant() proc->start(app, args); if (!proc->waitForStarted()) { - QMessageBox::critical(nullptr, QObject::tr("Simple Text Viewer"), - QObject::tr("Unable to launch Qt Assistant (%1)").arg(app)); + QMessageBox::critical(nullptr, + tr("Simple Text Viewer"), + tr("Unable to launch Qt Assistant (%1)").arg(app)); return false; } } diff --git a/examples/assistant/simpletextviewer/assistant.h b/examples/assistant/simpletextviewer/assistant.h index dada5a1ee..1ea7dd78f 100644 --- a/examples/assistant/simpletextviewer/assistant.h +++ b/examples/assistant/simpletextviewer/assistant.h @@ -51,6 +51,7 @@ #ifndef ASSISTANT_H #define ASSISTANT_H +#include <QCoreApplication> #include <QString> QT_BEGIN_NAMESPACE @@ -59,6 +60,8 @@ QT_END_NAMESPACE class Assistant { + Q_DECLARE_TR_FUNCTIONS(Assistant) + public: Assistant(); ~Assistant(); diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp index 235080f5c..6d6d5e5df 100644 --- a/src/windeployqt/main.cpp +++ b/src/windeployqt/main.cpp @@ -100,7 +100,8 @@ enum QtModule QtWebChannelModule = 0x0000200000000000, QtTextToSpeechModule = 0x0000400000000000, QtSerialBusModule = 0x0000800000000000, - QtGamePadModule = 0x0001000000000000 + QtGamePadModule = 0x0001000000000000, + Qt3DAnimationModule = 0x0002000000000000 }; struct QtModuleEntry { @@ -156,6 +157,7 @@ static QtModuleEntry qtModuleEntries[] = { { Qt3DQuickModule, "3dquick", "Qt53DQuick", 0 }, { Qt3DQuickRendererModule, "3dquickrenderer", "Qt53DQuickRender", 0 }, { Qt3DInputModule, "3dinput", "Qt53DInput", 0 }, + { Qt3DAnimationModule, "3danimation", "Qt53DAnimation", 0 }, { QtLocationModule, "geoservices", "Qt5Location", 0 }, { QtWebChannelModule, "webchannel", "Qt5WebChannel", 0 }, { QtTextToSpeechModule, "texttospeech", "Qt5TextToSpeech", 0 }, diff --git a/src/winrtrunner/appxlocalengine.cpp b/src/winrtrunner/appxlocalengine.cpp index d7cf35b31..b5692cddc 100644 --- a/src/winrtrunner/appxlocalengine.cpp +++ b/src/winrtrunner/appxlocalengine.cpp @@ -349,8 +349,6 @@ AppxLocalEngine::AppxLocalEngine(Runner *runner) AppxLocalEngine::~AppxLocalEngine() { - Q_D(const AppxLocalEngine); - CloseHandle(d->processHandle); } bool AppxLocalEngine::installPackage(IAppxManifestReader *reader, const QString &filePath) |