diff options
Diffstat (limited to 'src/plugins/qmldesigner/designercore')
3 files changed, 11 insertions, 7 deletions
diff --git a/src/plugins/qmldesigner/designercore/imagecache/meshimagecachecollector.cpp b/src/plugins/qmldesigner/designercore/imagecache/meshimagecachecollector.cpp index 88aa4efd40..0a9cd7d6d3 100644 --- a/src/plugins/qmldesigner/designercore/imagecache/meshimagecachecollector.cpp +++ b/src/plugins/qmldesigner/designercore/imagecache/meshimagecachecollector.cpp @@ -35,10 +35,12 @@ void MeshImageCacheCollector::start(Utils::SmallStringView name, if (file.open()) { QString qtQuickVersion; QString qtQuick3DVersion; - QtSupport::QtVersion *qtVersion = QtSupport::QtKitAspect::qtVersion(target()->kit()); - if (qtVersion && qtVersion->qtVersion() < QVersionNumber(6, 0, 0)) { - qtQuickVersion = "2.15"; - qtQuick3DVersion = "1.15"; + if (target()) { + QtSupport::QtVersion *qtVersion = QtSupport::QtKitAspect::qtVersion(target()->kit()); + if (qtVersion && qtVersion->qtVersion() < QVersionNumber(6, 0, 0)) { + qtQuickVersion = "2.15"; + qtQuick3DVersion = "1.15"; + } } QString content{ diff --git a/src/plugins/qmldesigner/designercore/include/stylesheetmerger.h b/src/plugins/qmldesigner/designercore/include/stylesheetmerger.h index 547a660361..e4dc67cd5d 100644 --- a/src/plugins/qmldesigner/designercore/include/stylesheetmerger.h +++ b/src/plugins/qmldesigner/designercore/include/stylesheetmerger.h @@ -3,6 +3,8 @@ #ifndef STYLESHEETMERGER_H #define STYLESHEETMERGER_H +#include "qmldesignercorelib_global.h" + #include <QString> #include <QHash> #include <modelnode.h> @@ -19,8 +21,8 @@ struct ReparentInfo { bool alreadyReparented; }; - -class StylesheetMerger { +class QMLDESIGNERCORE_EXPORT StylesheetMerger +{ public: StylesheetMerger(AbstractView*, AbstractView*); void merge(); diff --git a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp index aac2e6fd11..f3790dad83 100644 --- a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp +++ b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp @@ -5,13 +5,13 @@ #include "texttomodelmerger.h" #include "modeltotextmerger.h" +#include "model_p.h" #include <bindingproperty.h> #include <customnotifications.h> #include <filemanager/astobjecttextextractor.h> #include <filemanager/firstdefinitionfinder.h> #include <filemanager/objectlengthcalculator.h> -#include <model_p.h> #include <modelnode.h> #include <modelnodepositionstorage.h> #include <nodeproperty.h> |