summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@qt.io>2022-03-18 10:12:57 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-03-18 17:09:42 +0000
commit5cb6c63a10e815169be397ac48475036b96836a9 (patch)
tree87eed500ce0fb17fabd3f05762dae6d811ff65ce
parent231661171434efde9b84115124e24ceb2c196f2f (diff)
Fix qttools build after include cleanup in qtbase
QMap and QHash need to be explicitly included. Change-Id: I43de3cdf0911c5ed5d86a2107c15cc32d94da30a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 9181c903b3f1e15650eb0a0074aa5fec5f98c977) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/assistant/assistant/aboutdialog.h1
-rw-r--r--src/assistant/assistant/bookmarkmodel.h1
-rw-r--r--src/assistant/assistant/helpdocsettingswidget.cpp1
-rw-r--r--src/assistant/qhelpgenerator/helpgenerator.cpp1
-rw-r--r--src/linguist/linguist/batchtranslationdialog.cpp1
-rw-r--r--src/linguist/linguist/mainwindow.h1
-rw-r--r--src/qtattributionsscanner/scanner.cpp1
7 files changed, 7 insertions, 0 deletions
diff --git a/src/assistant/assistant/aboutdialog.h b/src/assistant/assistant/aboutdialog.h
index da61e1880..570c51170 100644
--- a/src/assistant/assistant/aboutdialog.h
+++ b/src/assistant/assistant/aboutdialog.h
@@ -31,6 +31,7 @@
#include <QtWidgets/QTextBrowser>
#include <QtWidgets/QDialog>
+#include <QtCore/QMap>
QT_BEGIN_NAMESPACE
diff --git a/src/assistant/assistant/bookmarkmodel.h b/src/assistant/assistant/bookmarkmodel.h
index 73e6595af..5c99aafb2 100644
--- a/src/assistant/assistant/bookmarkmodel.h
+++ b/src/assistant/assistant/bookmarkmodel.h
@@ -29,6 +29,7 @@
#define BOOKMARKMODEL_H
#include <QtCore/QAbstractItemModel>
+#include <QtCore/QMap>
#include <QtGui/QIcon>
diff --git a/src/assistant/assistant/helpdocsettingswidget.cpp b/src/assistant/assistant/helpdocsettingswidget.cpp
index 646026a23..d7287e8c5 100644
--- a/src/assistant/assistant/helpdocsettingswidget.cpp
+++ b/src/assistant/assistant/helpdocsettingswidget.cpp
@@ -41,6 +41,7 @@
#include "helpdocsettingswidget.h"
#include "ui_helpdocsettingswidget.h"
+#include <QtCore/QMap>
#include <QtWidgets/QFileDialog>
#include <QtWidgets/QPushButton>
diff --git a/src/assistant/qhelpgenerator/helpgenerator.cpp b/src/assistant/qhelpgenerator/helpgenerator.cpp
index 6407bbbf0..a087c837c 100644
--- a/src/assistant/qhelpgenerator/helpgenerator.cpp
+++ b/src/assistant/qhelpgenerator/helpgenerator.cpp
@@ -48,6 +48,7 @@
#include <QtCore/QDebug>
#include <QtCore/QRegularExpression>
#include <QtCore/QSet>
+#include <QtCore/QMap>
#include <QtCore/QVariant>
#include <QtCore/QDateTime>
#include <QtCore/QStringConverter>
diff --git a/src/linguist/linguist/batchtranslationdialog.cpp b/src/linguist/linguist/batchtranslationdialog.cpp
index 2543ed736..d88bcc407 100644
--- a/src/linguist/linguist/batchtranslationdialog.cpp
+++ b/src/linguist/linguist/batchtranslationdialog.cpp
@@ -30,6 +30,7 @@
#include "phrase.h"
#include "messagemodel.h"
+#include <QtCore/QMap>
#include <QtWidgets/QMessageBox>
#include <QtWidgets/QProgressDialog>
diff --git a/src/linguist/linguist/mainwindow.h b/src/linguist/linguist/mainwindow.h
index e6313898f..9e39061fa 100644
--- a/src/linguist/linguist/mainwindow.h
+++ b/src/linguist/linguist/mainwindow.h
@@ -35,6 +35,7 @@
#include "messagemodel.h"
#include <QtCore/QHash>
+#include <QtCore/QMap>
#include <QtCore/QLocale>
#include <QtWidgets/QMainWindow>
diff --git a/src/qtattributionsscanner/scanner.cpp b/src/qtattributionsscanner/scanner.cpp
index 06abc2310..7910b1b87 100644
--- a/src/qtattributionsscanner/scanner.cpp
+++ b/src/qtattributionsscanner/scanner.cpp
@@ -30,6 +30,7 @@
#include "logging.h"
#include <QtCore/qdir.h>
+#include <QtCore/qhash.h>
#include <QtCore/qjsonarray.h>
#include <QtCore/qjsondocument.h>
#include <QtCore/qjsonobject.h>