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

Fix build with Qt 6

Browse Source 
Change-Id: I5c775460563dde17a363ea875d7f993e4e4d6ecd
Reviewed-by: Leander Schulten <Leander.Schulten@rwth-aachen.de>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Eike Ziller
2021-01-22 09:58:08 +01:00
parent ba667a342b
commit ad09faab4e
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -3168,7 +3168,7 @@ void GdbEngine::handleRegisterListing(const DebuggerResponse &response)
reg.name = parts.at(0); reg.name = parts.at(0);
reg.size = parts.at(4).toInt(); reg.size = parts.at(4).toInt();
reg.reportedType = parts.at(5); reg.reportedType = parts.at(5);
reg.groups = parts.at(6).split(',').toSet(); reg.groups = Utils::toSet(parts.at(6).split(','));
m_registers[gdbRegisterNumber] = reg; m_registers[gdbRegisterNumber] = reg;
} }
} }

1
src/plugins/qmldesigner/designercore/imagecache/imagecachecollectorinterface.h
View File

@@ -28,6 +28,7 @@
#include <imagecacheauxiliarydata.h> #include <imagecacheauxiliarydata.h>
#include <utils/smallstringview.h> #include <utils/smallstringview.h>
#include <QIcon>
#include <QImage> #include <QImage>
namespace QmlDesigner { namespace QmlDesigner {

1
src/plugins/qmldesigner/designercore/include/synchronousimagecache.h
View File

@@ -29,6 +29,7 @@
#include <utils/smallstring.h> #include <utils/smallstring.h>
#include <QIcon>
#include <QImage> #include <QImage>
#include <condition_variable> #include <condition_variable>