forked from qt-creator/qt-creator
Various Qt6 compile fixes
Task-number: QTCREATORBUG-24098 Change-Id: Ia0fe92d82d4477bd8f14ee25754b114316fc878a Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
@@ -37,4 +37,10 @@ constexpr QString::SplitBehavior SkipEmptyParts = QString::SkipEmptyParts;
|
|||||||
constexpr Qt::SplitBehaviorFlags SkipEmptyParts = Qt::SkipEmptyParts;
|
constexpr Qt::SplitBehaviorFlags SkipEmptyParts = Qt::SkipEmptyParts;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||||
|
using QHashSeedType = uint;
|
||||||
|
#else
|
||||||
|
using QHashSeedType = size_t;
|
||||||
|
#endif
|
||||||
|
|
||||||
} // namespace Utils
|
} // namespace Utils
|
||||||
|
@@ -31,6 +31,7 @@
|
|||||||
#include <QLabel>
|
#include <QLabel>
|
||||||
#include <QDialogButtonBox>
|
#include <QDialogButtonBox>
|
||||||
#include <QListWidget>
|
#include <QListWidget>
|
||||||
|
#include <QTextCodec>
|
||||||
|
|
||||||
namespace Utils { class ListWidget; }
|
namespace Utils { class ListWidget; }
|
||||||
namespace Core { class BaseTextDocument; }
|
namespace Core { class BaseTextDocument; }
|
||||||
|
@@ -465,7 +465,7 @@ void ReadOnlyFilesDialogPrivate::initDialog(const FilePaths &filePaths)
|
|||||||
|
|
||||||
// Also save the buttongroup for every file to get the result for each entry.
|
// Also save the buttongroup for every file to get the result for each entry.
|
||||||
buttonGroups.append({filePath, radioButtonGroup});
|
buttonGroups.append({filePath, radioButtonGroup});
|
||||||
QObject::connect(radioButtonGroup, QOverload<int>::of(&QButtonGroup::buttonClicked),
|
QObject::connect(radioButtonGroup, QOverload<QAbstractButton *>::of(&QButtonGroup::buttonClicked),
|
||||||
[this] { updateSelectAll(); });
|
[this] { updateSelectAll(); });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -29,6 +29,7 @@
|
|||||||
#include "../idocument.h"
|
#include "../idocument.h"
|
||||||
|
|
||||||
#include "documentmodel.h"
|
#include "documentmodel.h"
|
||||||
|
#include "ieditor.h"
|
||||||
|
|
||||||
#include "utils/textfileformat.h"
|
#include "utils/textfileformat.h"
|
||||||
|
|
||||||
@@ -43,7 +44,6 @@ namespace Utils { class MimeType; }
|
|||||||
|
|
||||||
namespace Core {
|
namespace Core {
|
||||||
|
|
||||||
class IEditor;
|
|
||||||
class IDocument;
|
class IDocument;
|
||||||
class SearchResultItem;
|
class SearchResultItem;
|
||||||
|
|
||||||
|
@@ -453,7 +453,7 @@ ExternalTool * ExternalTool::createFromXml(const QByteArray &xml, QString *error
|
|||||||
tool->m_environment = EnvironmentItem::fromStringList(lines);
|
tool->m_environment = EnvironmentItem::fromStringList(lines);
|
||||||
} else {
|
} else {
|
||||||
reader.raiseError(QString::fromLatin1("Unknown element <%1> as subelement of <%2>").arg(
|
reader.raiseError(QString::fromLatin1("Unknown element <%1> as subelement of <%2>").arg(
|
||||||
reader.qualifiedName().toString(), kExecutable));
|
reader.qualifiedName().toString(), QString(kExecutable)));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -26,7 +26,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "core_global.h"
|
#include "core_global.h"
|
||||||
#include "id.h"
|
#include "icontext.h"
|
||||||
|
|
||||||
#include <QList>
|
#include <QList>
|
||||||
#include <QMainWindow>
|
#include <QMainWindow>
|
||||||
@@ -48,7 +48,6 @@ class InfoBar;
|
|||||||
|
|
||||||
namespace Core {
|
namespace Core {
|
||||||
class Context;
|
class Context;
|
||||||
class IContext;
|
|
||||||
class IWizardFactory;
|
class IWizardFactory;
|
||||||
class SettingsDatabase;
|
class SettingsDatabase;
|
||||||
|
|
||||||
|
@@ -25,7 +25,8 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <coreplugin/core_global.h>
|
#include "core_global.h"
|
||||||
|
#include "generatedfile.h"
|
||||||
|
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
#include <QList>
|
#include <QList>
|
||||||
@@ -38,7 +39,6 @@ QT_END_NAMESPACE
|
|||||||
namespace Core {
|
namespace Core {
|
||||||
|
|
||||||
class IWizardFactory;
|
class IWizardFactory;
|
||||||
class GeneratedFile;
|
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
Hook to add generic wizard pages to implementations of IWizard.
|
Hook to add generic wizard pages to implementations of IWizard.
|
||||||
|
@@ -76,6 +76,7 @@
|
|||||||
#include <utils/stringutils.h>
|
#include <utils/stringutils.h>
|
||||||
#include <utils/utilsicons.h>
|
#include <utils/utilsicons.h>
|
||||||
|
|
||||||
|
#include <QActionGroup>
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
#include <QCloseEvent>
|
#include <QCloseEvent>
|
||||||
#include <QColorDialog>
|
#include <QColorDialog>
|
||||||
|
@@ -32,6 +32,7 @@
|
|||||||
#include "locator/locatormanager.h"
|
#include "locator/locatormanager.h"
|
||||||
|
|
||||||
#include <utils/algorithm.h>
|
#include <utils/algorithm.h>
|
||||||
|
#include <utils/porting.h>
|
||||||
#include <utils/qtcassert.h>
|
#include <utils/qtcassert.h>
|
||||||
#include <utils/stringutils.h>
|
#include <utils/stringutils.h>
|
||||||
|
|
||||||
@@ -41,7 +42,7 @@
|
|||||||
#include <QTimer>
|
#include <QTimer>
|
||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
uint qHash(const QPointer<QAction> &p, uint seed)
|
uint qHash(const QPointer<QAction> &p, Utils::QHashSeedType seed)
|
||||||
{
|
{
|
||||||
return qHash(p.data(), seed);
|
return qHash(p.data(), seed);
|
||||||
}
|
}
|
||||||
|
@@ -300,7 +300,8 @@ void MultiExportDialog::accept()
|
|||||||
}
|
}
|
||||||
if (data.size() > 1 && data.at(0).fileName == data.at(1).fileName) {
|
if (data.size() > 1 && data.at(0).fileName == data.at(1).fileName) {
|
||||||
QMessageBox::warning(this, windowTitle(),
|
QMessageBox::warning(this, windowTitle(),
|
||||||
tr("The file name must contain one of the placeholders %1, %2.").arg("%1", "%2"));
|
tr("The file name must contain one of the placeholders %1, %2.")
|
||||||
|
.arg(QString("%1"), QString("%2")));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -31,6 +31,10 @@
|
|||||||
|
|
||||||
#include <coreplugin/dialogs/ioptionspage.h>
|
#include <coreplugin/dialogs/ioptionspage.h>
|
||||||
|
|
||||||
|
QT_BEGIN_NAMESPACE
|
||||||
|
class QTextCodec;
|
||||||
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
namespace TextEditor {
|
namespace TextEditor {
|
||||||
|
|
||||||
class TabSettings;
|
class TabSettings;
|
||||||
|
Reference in New Issue
Block a user