feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

More small Qt 6 porting changes

Browse Source 
Task-number: QTCREATORBUG-24098
Change-Id: Ia7d972a35d2a99b74dc409091833b1a215a3eb64
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2020-07-14 09:47:24 +02:00
parent 4ad5fc51ba
commit 3ab1713680
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmljseditor/qmljshoverhandler.cpp
View File

@@ -173,7 +173,7 @@ bool QmlJSHoverHandler::setQmlTypeHelp(const ScopeChain &scopeChain, const Docum
QRegularExpressionMatch m = version.match(moduleName); QRegularExpressionMatch m = version.match(moduleName);
if (m.hasMatch()) { if (m.hasMatch()) {
QMap<QString, QUrl> filteredUrlMap; QMap<QString, QUrl> filteredUrlMap;
QStringRef maj = m.capturedRef(2); const QString maj = m.captured(2);
for (const HelpItem::Link &link : links) { for (const HelpItem::Link &link : links) {
QString urlModuleName = link.second.path().split('/')[1]; QString urlModuleName = link.second.path().split('/')[1];
if (urlModuleName.contains(maj)) if (urlModuleName.contains(maj))

7
src/plugins/valgrind/callgrind/callgrindcostitem.h
View File

@@ -25,12 +25,7 @@
#pragma once #pragma once
#include <QtGlobal> #include <QVector>
QT_BEGIN_NAMESPACE
class QString;
template<typename T> class QVector;
QT_END_NAMESPACE
namespace Valgrind { namespace Valgrind {
namespace Callgrind { namespace Callgrind {