diff --git a/share/qtcreator/templates/wizards/classes/cpp/wizard.json b/share/qtcreator/templates/wizards/classes/cpp/wizard.json index ad2a8f77845..9b8cfc3dc8e 100644 --- a/share/qtcreator/templates/wizards/classes/cpp/wizard.json +++ b/share/qtcreator/templates/wizards/classes/cpp/wizard.json @@ -19,7 +19,7 @@ { "key": "isQObject", "value": "%{JS: [ 'QObject', 'QWidget', 'QMainWindow', 'QQuickItem'].indexOf(value('Base')) >= 0 }" }, { "key": "GUARD", "value": "%{JS: Cpp.headerGuard(value('HdrFileName'))}" }, { "key": "SharedDataInit", "value": "%{JS: (value('IncludeQSharedData')) ? 'data(new %{CN}Data)' : '' }" }, - { "key": "Dependencies", "value": "%{JS: '' + (value('IncludeQObject') || value('IncludeQSharedData') || value('BaseCB') === 'QObject' ? ':Qt.core' : '') + (value('IncludeQWidget') || value('IncludeQMainWindow') || value('BaseCB') === 'QWidget' || value('BaseCB') === 'QMainWindow' ? ':Qt.widgets' : '') + (value('IncludeQQuickItem') || value('BaseCB') === 'QQuickItem' ? ':Qt.quick' : '')}"} + { "key": "Dependencies", "value": "%{JS: '' + (value('IncludeQObject') || value('IncludeQSharedData') || value('BaseCB') === 'QObject' ? ':Qt.Core' : '') + (value('IncludeQWidget') || value('IncludeQMainWindow') || value('BaseCB') === 'QWidget' || value('BaseCB') === 'QMainWindow' ? ':Qt.Widgets' : '') + (value('IncludeQQuickItem') || value('BaseCB') === 'QQuickItem' ? ':Qt.Quick' : '')}"} ], "pages": diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp index a8ad354181c..ac554b9d2bb 100644 --- a/src/plugins/qbsprojectmanager/qbsproject.cpp +++ b/src/plugins/qbsprojectmanager/qbsproject.cpp @@ -309,17 +309,22 @@ bool QbsBuildSystem::renameFiles(Node *context, const FilePairs &filesToRename, bool QbsBuildSystem::addDependencies(ProjectExplorer::Node *context, const QStringList &dependencies) { + const QStringList lowercaseDeps = transform(dependencies, [](const QString &dep) -> QString { + QTC_ASSERT(dep.size() > 3, return dep); + return dep.left(3) + dep.mid(3).toLower(); + }); + if (session()->apiLevel() < 9) - return BuildSystem::addDependencies(context, dependencies); + return BuildSystem::addDependencies(context, lowercaseDeps); if (auto *n = dynamic_cast(context)) { const QbsProductNode * const prdNode = parentQbsProductNode(n); QTC_ASSERT(prdNode, return false); - return addDependenciesToProduct(dependencies, prdNode->productData(), n->groupData()); + return addDependenciesToProduct(lowercaseDeps, prdNode->productData(), n->groupData()); } if (auto *n = dynamic_cast(context)) - return addDependenciesToProduct(dependencies, n->productData(), n->mainGroup()); + return addDependenciesToProduct(lowercaseDeps, n->productData(), n->mainGroup()); return BuildSystem::addDependencies(context, dependencies); } diff --git a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp index e8d3d88668b..42044e4caa9 100644 --- a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp @@ -628,7 +628,7 @@ bool QmakePriFile::addDependencies(const QStringList &dependencies) return dep.length() > 3 && dep.startsWith("Qt."); }); qtDependencies = transform(qtDependencies, [](const QString &dep) { - return dep.mid(3); + return dep.mid(3).toLower(); }); if (qtDependencies.isEmpty()) return true; diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 6d4c6aca7cf..220699343ee 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -310,7 +310,7 @@ QString QtVersion::moduleForHeader(const QString &headerFileName) const for (auto it = d->m_classesPerModule->cbegin(); it != d->m_classesPerModule->cend(); ++it) { if (it.value().contains(headerFileName)) { QTC_ASSERT(it.key().size() > 2, return it.key()); - return it.key().left(2) + '.' + it.key().mid(2).toLower(); + return it.key().left(2) + '.' + it.key().mid(2); } } return {}; diff --git a/src/plugins/qtsupport/baseqtversion.h b/src/plugins/qtsupport/baseqtversion.h index 2d404aba070..0894161adb8 100644 --- a/src/plugins/qtsupport/baseqtversion.h +++ b/src/plugins/qtsupport/baseqtversion.h @@ -174,7 +174,7 @@ public: Utils::FilePath librarySearchPath() const; Utils::FilePaths directoriesToIgnoreInProjectTree() const; - QString moduleForHeader(const QString &className) const; // Format is "Qt.core" + QString moduleForHeader(const QString &className) const; // Format is "Qt.Core" QString qtNamespace() const; QString qtLibInfix() const;