From bbe95b573327e8c4a44422efaefef4a186271e2f Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Mon, 28 Sep 2020 17:28:05 +0200
Subject: [PATCH] Qt6: Various include, QPrinter, and QFlags adaptations

Task-number: QTCREATORBUG-24098
Change-Id: I7aca7d25a063c84d6eec14c2c5789357ce56a7b3
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/clangtools/clangfileinfo.h                | 2 ++
 src/plugins/cppeditor/cppcodemodelinspectordialog.cpp | 4 ++--
 src/plugins/designer/formeditorw.cpp                  | 7 ++++---
 src/plugins/texteditor/texteditor.cpp                 | 8 ++++----
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/plugins/clangtools/clangfileinfo.h b/src/plugins/clangtools/clangfileinfo.h
index 093fc28dee1..bc80f7b1b18 100644
--- a/src/plugins/clangtools/clangfileinfo.h
+++ b/src/plugins/clangtools/clangfileinfo.h
@@ -30,6 +30,8 @@
 
 #include <utils/fileutils.h>
 
+#include <QSet>
+
 namespace ClangTools {
 namespace Internal {
 
diff --git a/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp b/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
index 7ca619cebcb..98a7a3a1805 100644
--- a/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
+++ b/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
@@ -817,7 +817,7 @@ QVariant MacrosModel::data(const QModelIndex &index, int role) const
         else if (column == MacroColumn)
             return macro.toString();
     } else if (role == Qt::TextAlignmentRole) {
-        return Qt::AlignTop + Qt::AlignLeft;
+        return QVariant::fromValue(Qt::AlignTop | Qt::AlignLeft);
     }
     return QVariant();
 }
@@ -1067,7 +1067,7 @@ QVariant TokensModel::data(const QModelIndex &index, int role) const
         else if (column == NewlineColumn)
             return CMI::Utils::toString(token.newline());
     } else if (role == Qt::TextAlignmentRole) {
-        return Qt::AlignTop + Qt::AlignLeft;
+        return QVariant::fromValue(Qt::AlignTop | Qt::AlignLeft);
     }
     return QVariant();
 }
diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp
index 6d555f2dbff..84b9c9bbc72 100644
--- a/src/plugins/designer/formeditorw.cpp
+++ b/src/plugins/designer/formeditorw.cpp
@@ -851,7 +851,7 @@ void FormEditorData::print()
 
     QPrinter *printer = ICore::printer();
     const bool oldFullPage =  printer->fullPage();
-    const QPrinter::Orientation oldOrientation =  printer->orientation ();
+    const QPageLayout::Orientation oldOrientation = printer->pageLayout().orientation();
     printer->setFullPage(false);
     do {
         // Grab the image to be able to a suggest suitable orientation
@@ -863,7 +863,8 @@ void FormEditorData::print()
         }
 
         const QSizeF pixmapSize = pixmap.size();
-        printer->setOrientation( pixmapSize.width() > pixmapSize.height() ?  QPrinter::Landscape :  QPrinter::Portrait);
+        printer->setPageOrientation(pixmapSize.width() > pixmapSize.height() ? QPageLayout::Landscape
+                                                                             : QPageLayout::Portrait);
 
         // Printer parameters
         QPrintDialog dialog(printer, fw);
@@ -895,7 +896,7 @@ void FormEditorData::print()
 
     } while (false);
     printer->setFullPage(oldFullPage);
-    printer->setOrientation(oldOrientation);
+    printer->setPageOrientation(oldOrientation);
 }
 
 } // namespace Internal
diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp
index bc711507c78..97978476a25 100644
--- a/src/plugins/texteditor/texteditor.cpp
+++ b/src/plugins/texteditor/texteditor.cpp
@@ -1164,7 +1164,7 @@ void TextEditorWidgetPrivate::print(QPrinter *printer)
     if (!p.isActive())
         return;
 
-    QRectF pageRect(printer->pageRect());
+    QRectF pageRect(printer->pageLayout().paintRectPixels(printer->resolution()));
     if (pageRect.isEmpty())
         return;
 
@@ -1236,9 +1236,9 @@ void TextEditorWidgetPrivate::print(QPrinter *printer)
     int pageCopies;
     if (printer->collateCopies() == true) {
         docCopies = 1;
-        pageCopies = printer->numCopies();
+        pageCopies = printer->copyCount();
     } else {
-        docCopies = printer->numCopies();
+        docCopies = printer->copyCount();
         pageCopies = 1;
     }
 
@@ -1262,7 +1262,7 @@ void TextEditorWidgetPrivate::print(QPrinter *printer)
     }
 
     qCDebug(printLog) << "Printing " << m_document->filePath() << ":\n"
-                      << "  number of copies:" << printer->numCopies() << '\n'
+                      << "  number of copies:" << printer->copyCount() << '\n'
                       << "  from page" << fromPage << "to" << toPage << '\n'
                       << "  document page count:" << doc->pageCount() << '\n'
                       << "  page rectangle:" << pageRect << '\n'