diff options
| author | Thomas Hartmann <thomas.hartmann@qt.io> | 2019-10-21 09:00:55 +0200 |
|---|---|---|
| committer | Thomas Hartmann <thomas.hartmann@qt.io> | 2019-10-21 12:13:13 +0000 |
| commit | 5e225f85eb7c3e4493ce741d0bfad25d173b73ca (patch) | |
| tree | f5b01366458326faaaa3e5d3ef5d264b67774034 /src/plugins | |
| parent | ac84f8a45717ce65f11be7e71190edd3425a85c8 (diff) | |
| download | qt-creator-5e225f85eb7c3e4493ce741d0bfad25d173b73ca.tar.gz | |
QmlDesigner: Fix Coverity scan defects
Change-Id: I07a61fe4498ae0b28baaa969f0decfa5689b4443
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp | 8 | ||||
| -rw-r--r-- | src/plugins/qmldesigner/documentmanager.cpp | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp index 12a55c25fe..adf962c2cc 100644 --- a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp +++ b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp @@ -464,14 +464,11 @@ QProcessEnvironment PuppetCreator::processEnvironment() const #ifndef QMLDESIGNER_TEST view = QmlDesignerPlugin::instance()->viewManager().nodeInstanceView(); view->emitCustomNotification("PuppetStatus", {}, {QVariant(m_qrcMapping)}); -#endif - - QStringList importPaths = m_model->importPaths(); QmlDesigner::Import import = QmlDesigner::Import::createLibraryImport("QtQuick3D", "1.0"); bool view3DEnabled = false; - if (view && m_model->hasImport(import, true, true)) { + if (m_model->hasImport(import, true, true)) { if (view->rootModelNode().hasAuxiliaryData("3d-view")) view3DEnabled = view->rootModelNode().auxiliaryData("3d-view").toBool(); else @@ -480,6 +477,9 @@ QProcessEnvironment PuppetCreator::processEnvironment() const if (view3DEnabled) environment.set("QMLDESIGNER_QUICK3D_MODE", "true"); +#endif + + QStringList importPaths = m_model->importPaths(); /* For the fallback puppet we have to remove the path to the original qtbase plugins to avoid conflics */ if (m_availablePuppetType == FallbackPuppet) diff --git a/src/plugins/qmldesigner/documentmanager.cpp b/src/plugins/qmldesigner/documentmanager.cpp index 45fd495759..2cae7208c5 100644 --- a/src/plugins/qmldesigner/documentmanager.cpp +++ b/src/plugins/qmldesigner/documentmanager.cpp @@ -424,7 +424,8 @@ void DocumentManager::findPathToIsoProFile(bool *iconResourceFileAlreadyExists, if (!iconQrcFileNode) { // The QRC file that we want doesn't exist or is not listed under RESOURCES in the .pro. - *resourceFilePath = project->projectDirectory().toString() + "/" + isoIconsQrcFile; + if (project) + *resourceFilePath = project->projectDirectory().toString() + "/" + isoIconsQrcFile; // We assume that the .pro containing the QML file is an acceptable place to add the .qrc file. ProjectExplorer::ProjectNode *projectNode = ProjectExplorer::ProjectTree::nodeForFile(qmlFileName)->parentProjectNode(); |