Re: [PATCH v3 1/1] kconfig: port qconf to work with Qt6 in addition to Qt5

[Masahiro Yamada]

On Thu, Aug 10, 2023 at 6:10 AM Boris Kolpackov <boris@xxxxxxxxxxxxxxxxx> wrote:
>
> Tested with Qt5 5.15 and Qt6 6.4. Note that earlier versions of Qt5
> are no longer guaranteed to work.
>
> Signed-off-by: Boris Kolpackov <boris@xxxxxxxxxxxxxxxxx>


Applied to linux-kbuild. Thanks.


I sorted the include directives alphabetically.


The following is the diff from your original patch.




diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index 3a4d7a19e800..620a3527c767 100644
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -9,7 +9,6 @@
 #include <QApplication>
 #include <QCloseEvent>
 #include <QDebug>
-#include <QScreen>
 #include <QFileDialog>
 #include <QLabel>
 #include <QLayout>
@@ -17,8 +16,9 @@
 #include <QMenu>
 #include <QMenuBar>
 #include <QMessageBox>
-#include <QToolBar>
 #include <QRegularExpression>
+#include <QScreen>
+#include <QToolBar>

 #include <stdlib.h>












--
Best Regards
Masahiro Yamada