Add QtOpenGLWidgets to masterinclude

- add missing modules for qt6 in CI

Author: mrbean-bremen

.github/workflows/build_latest.yml

@@ -31,9 +31,9 @@ jobs:
       uses: jurplel/install-qt-action@v3
       with:
         version: ${{ matrix.qt-version }}
-        modules: ${{startsWith(matrix.qt-version, '6') && 'qt5compat' || '' }}
+        modules: ${{startsWith(matrix.qt-version, '6') && 'qt5compat qtscxml qtpositioning qtwebchannel qtmultimedia qtwebengine' || '' }}
         arch: ${{ matrix.os == 'ubuntu' && 'gcc_64' || (startsWith(matrix.qt-version, '5.12') && 'win64_msvc2017_64' || 'win64_msvc2019_64') }}
-        archives: "qtmultimedia qtbase qttools ${{ matrix.os == 'windows' && 'qtwinextras' || 'qtlinuxextras qtwayland icu' }}"
+        archives: "qtmultimedia qtbase qttools qtdeclarative ${{ matrix.os == 'windows' && 'qtwinextras' || 'qtlinuxextras qtwayland icu' }}"
 
     - name: Setup Python ${{ matrix.python-version }}
       uses: actions/setup-python@v4

generator/qtscript_masterinclude.h

@@ -127,9 +127,11 @@
 #include <QtQuickWidgets/QtQuickWidgets>
 #endif
 
+#if QT_VERSION < 0x060000
 #ifndef QT_NO_XMLPATTERNS
 #  include <QtXmlPatterns/QtXmlPatterns>
 #endif
+#endif
 
 #ifndef QT_NO_WEBKIT
 #  include <QtWebKit/QtWebKit>
@@ -1232,4 +1234,8 @@
 #define GL_LOGIC_OP GL_INDEX_LOGIC_OP
 #define GL_TEXTURE_COMPONENTS GL_TEXTURE_INTERNAL_FORMAT
 #include <QtOpenGL/QtOpenGL>
+#if QT_VERSION >= 0x060000
+#include <QtOpenGLWidgets/QtOpenGLWidgets>
+#endif
+
 #endif // QT_NO_OPENGL