diff options
| author | hjk <hjk@qt.io> | 2020-06-26 13:59:38 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2020-07-06 11:15:18 +0000 |
| commit | e1c88116b397ecac2ef0f0678a419790a3e40402 (patch) | |
| tree | 830be4b2f1aabad0522c7e01287ec9197b55e4cf /src/plugins/qmldesigner/designercore | |
| parent | c9eedbe0f387f33e5e455af03a795d2114528543 (diff) | |
Core/Utils: Migrate further to Utils::Id
The coreplugin/id.h header is kept for downstream for now.
Change-Id: I8c44590f7b988b3770ecdc177c40783e12353e66
(cherry picked from commit 430a33dcd9ac80ddb848e41f8f059102857c88aa)
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/qmldesigner/designercore')
| -rw-r--r-- | src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/qmldesigner/designercore/instances/puppetcreator.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp index fcd5e88404..c74c41b323 100644 --- a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp +++ b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp @@ -91,7 +91,7 @@ public: } }; -QHash<Core::Id, PuppetCreator::PuppetType> PuppetCreator::m_qml2PuppetForKitPuppetHash; +QHash<Utils::Id, PuppetCreator::PuppetType> PuppetCreator::m_qml2PuppetForKitPuppetHash; QByteArray PuppetCreator::qtHash() const { diff --git a/src/plugins/qmldesigner/designercore/instances/puppetcreator.h b/src/plugins/qmldesigner/designercore/instances/puppetcreator.h index bafea8fa3e..00b5a0e921 100644 --- a/src/plugins/qmldesigner/designercore/instances/puppetcreator.h +++ b/src/plugins/qmldesigner/designercore/instances/puppetcreator.h @@ -107,7 +107,7 @@ private: mutable QString m_compileLog; ProjectExplorer::Target *m_target = nullptr; PuppetType m_availablePuppetType; - static QHash<Core::Id, PuppetType> m_qml2PuppetForKitPuppetHash; + static QHash<Utils::Id, PuppetType> m_qml2PuppetForKitPuppetHash; const Model *m_model = nullptr; #ifndef QMLDESIGNER_TEST const DesignerSettings m_designerSettings; |