Some Qt6 compilation

Change-Id: Icbc9ed41e75799d2d0e16ef16379fec05f80b62e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2020-07-11 09:14:48 +02:00
parent 8b5a1ad92a
commit c2dec324aa
3 changed files with 2 additions and 3 deletions
@@ -84,7 +84,6 @@
#include <QQmlContext>
#include <qqmllist.h>
#include <QAbstractAnimation>
#include <QMutableVectorIterator>
#include <QQuickView>
#include <QSet>
#include <designersupportdelegate.h>
+1 -1
View File
@@ -25,7 +25,7 @@
#pragma once
#include <QtGlobal>
#include <QVector>
QT_BEGIN_NAMESPACE
class QTreeView;
+1 -1
View File
@@ -847,7 +847,7 @@ static bool canLinkWithQt(QString *toolTip)
const QString link = installSettingsValue ? *installSettingsValue : QString();
if (!link.isEmpty())
tip << QtOptionsPageWidget::tr("%1 is currently linked to \"%2\".")
.arg(Core::Constants::IDE_DISPLAY_NAME, link);
.arg(QString(Core::Constants::IDE_DISPLAY_NAME), link);
if (toolTip)
*toolTip = tip.join("\n\n");
return canLink;