82 files changed, 100 insertions, 101 deletions
diff --git a/src/gui/gui.pro b/src/gui/gui.pro
index f9ae32b6b5e..c4a73f4e130 100644
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -11,12 +11,11 @@ unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore
 
 include(../qbase.pri)
 
-# stuff that goes into new QtGui
-include(guikernel/guikernel.pri)
+include(kernel/kernel.pri)
 include(image/image.pri)
 include(text/text.pri)
 include(painting/painting.pri)
-include(guiutil/guiutil.pri)
+include(util/util.pri)
 include(math3d/math3d.pri)
 
 include(egl/egl.pri)
diff --git a/src/gui/guikernel/guikernel.pri b/src/gui/guikernel/guikernel.pri
deleted file mode 100644
index 8e41b550495..00000000000
--- a/src/gui/guikernel/guikernel.pri
+++ /dev/null
@@ -1,88 +0,0 @@
-# Qt kernel module
-
-# Only used on platforms with CONFIG += precompile_header
-PRECOMPILED_HEADER = guikernel/qt_gui_pch.h
-
-
-KERNEL_P= guikernel
-HEADERS += \
-        guikernel/qclipboard.h \
-        guikernel/qcursor.h \
-        guikernel/qcursor_p.h \
-        guikernel/qevent.h \
-        guikernel/qevent_p.h \
-        guikernel/qkeysequence.h \
-        guikernel/qkeysequence_p.h \
-        guikernel/qkeymapper_p.h \
-        guikernel/qmime.h \
-        guikernel/qpalette.h \
-        guikernel/qsessionmanager.h \
-        guikernel/qwindowdefs.h \
-
-SOURCES += \
-        guikernel/qclipboard.cpp \
-        guikernel/qcursor.cpp \
-        guikernel/qevent.cpp \
-        guikernel/qkeysequence.cpp \
-        guikernel/qkeymapper.cpp \
-        guikernel/qkeymapper_qpa.cpp \
-        guikernel/qmime.cpp \
-        guikernel/qpalette.cpp \
-        guikernel/qguivariant.cpp \
-
-qpa {
-	HEADERS += \
-                guikernel/qgenericpluginfactory_qpa.h \
-                guikernel/qgenericplugin_qpa.h \
-                guikernel/qeventdispatcher_qpa_p.h \
-                guikernel/qwindowsysteminterface_qpa.h \
-                guikernel/qwindowsysteminterface_qpa_p.h \
-                guikernel/qplatformintegration_qpa.h \
-                guikernel/qplatformscreen_qpa.h \
-                guikernel/qplatformintegrationfactory_qpa_p.h \
-                guikernel/qplatformintegrationplugin_qpa.h \
-                guikernel/qplatformwindow_qpa.h \
-                guikernel/qplatformglcontext_qpa.h \
-                guikernel/qwindowcontext_qpa.h \
-                guikernel/qplatformeventloopintegration_qpa.h \
-                guikernel/qplatformcursor_qpa.h \
-                guikernel/qplatformclipboard_qpa.h \
-                guikernel/qplatformnativeinterface_qpa.h \
-                guikernel/qwindowformat_qpa.h \
-                guikernel/qguiapplication.h \
-                guikernel/qguiapplication_p.h \
-                guikernel/qwindow_p.h \
-                guikernel/qwindow.h
-
-	SOURCES += \
-                guikernel/qclipboard_qpa.cpp \
-                guikernel/qcursor_qpa.cpp \
-                guikernel/qgenericpluginfactory_qpa.cpp \
-                guikernel/qgenericplugin_qpa.cpp \
-                guikernel/qeventdispatcher_qpa.cpp \
-                guikernel/qwindowsysteminterface_qpa.cpp \
-                guikernel/qplatformintegration_qpa.cpp \
-                guikernel/qplatformscreen_qpa.cpp \
-                guikernel/qplatformintegrationfactory_qpa.cpp \
-                guikernel/qplatformintegrationplugin_qpa.cpp \
-                guikernel/qplatformwindow_qpa.cpp \
-                guikernel/qplatformeventloopintegration_qpa.cpp \
-                guikernel/qplatformglcontext_qpa.cpp \
-                guikernel/qwindowcontext_qpa.cpp \
-                guikernel/qplatformcursor_qpa.cpp \
-                guikernel/qplatformclipboard_qpa.cpp \
-                guikernel/qplatformnativeinterface_qpa.cpp \
-                guikernel/qsessionmanager_qpa.cpp \
-                guikernel/qwindowformat_qpa.cpp \
-                guikernel/qguiapplication.cpp \
-                guikernel/qwindow.cpp
-
-        contains(QT_CONFIG, glib) {
-            SOURCES += \
-                guikernel/qeventdispatcher_glib_qpa.cpp
-            HEADERS += \
-                guikernel/qeventdispatcher_glib_qpa_p.h
-            QMAKE_CXXFLAGS += $$QT_CFLAGS_GLIB
-            LIBS_PRIVATE +=$$QT_LIBS_GLIB
-	}
-}
diff --git a/src/gui/guiutil/guiutil.pri b/src/gui/guiutil/guiutil.pri
deleted file mode 100644
index 95ec2cfc0fa..00000000000
--- a/src/gui/guiutil/guiutil.pri
+++ /dev/null
@@ -1,10 +0,0 @@
-# Qt util module
-
-HEADERS += \
-        guiutil/qdesktopservices.h \
-        guiutil/qhexstring_p.h \
-        guiutil/qvalidator.h
-
-SOURCES += \
-        guiutil/qdesktopservices.cpp \
-        guiutil/qvalidator.cpp
diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri
new file mode 100644
index 00000000000..6fda4fd62f2
--- /dev/null
+++ b/src/gui/kernel/kernel.pri
@@ -0,0 +1,88 @@
+# Qt kernel module
+
+# Only used on platforms with CONFIG += precompile_header
+PRECOMPILED_HEADER = kernel/qt_gui_pch.h
+
+
+KERNEL_P= kernel
+HEADERS += \
+        kernel/qclipboard.h \
+        kernel/qcursor.h \
+        kernel/qcursor_p.h \
+        kernel/qevent.h \
+        kernel/qevent_p.h \
+        kernel/qkeysequence.h \
+        kernel/qkeysequence_p.h \
+        kernel/qkeymapper_p.h \
+        kernel/qmime.h \
+        kernel/qpalette.h \
+        kernel/qsessionmanager.h \
+        kernel/qwindowdefs.h \
+
+SOURCES += \
+        kernel/qclipboard.cpp \
+        kernel/qcursor.cpp \
+        kernel/qevent.cpp \
+        kernel/qkeysequence.cpp \
+        kernel/qkeymapper.cpp \
+        kernel/qkeymapper_qpa.cpp \
+        kernel/qmime.cpp \
+        kernel/qpalette.cpp \
+        kernel/qguivariant.cpp \
+
+qpa {
+	HEADERS += \
+                kernel/qgenericpluginfactory_qpa.h \
+                kernel/qgenericplugin_qpa.h \
+                kernel/qeventdispatcher_qpa_p.h \
+                kernel/qwindowsysteminterface_qpa.h \
+                kernel/qwindowsysteminterface_qpa_p.h \
+                kernel/qplatformintegration_qpa.h \
+                kernel/qplatformscreen_qpa.h \
+                kernel/qplatformintegrationfactory_qpa_p.h \
+                kernel/qplatformintegrationplugin_qpa.h \
+                kernel/qplatformwindow_qpa.h \
+                kernel/qplatformglcontext_qpa.h \
+                kernel/qwindowcontext_qpa.h \
+                kernel/qplatformeventloopintegration_qpa.h \
+                kernel/qplatformcursor_qpa.h \
+                kernel/qplatformclipboard_qpa.h \
+                kernel/qplatformnativeinterface_qpa.h \
+                kernel/qwindowformat_qpa.h \
+                kernel/qguiapplication.h \
+                kernel/qguiapplication_p.h \
+                kernel/qwindow_p.h \
+                kernel/qwindow.h
+
+	SOURCES += \
+                kernel/qclipboard_qpa.cpp \
+                kernel/qcursor_qpa.cpp \
+                kernel/qgenericpluginfactory_qpa.cpp \
+                kernel/qgenericplugin_qpa.cpp \
+                kernel/qeventdispatcher_qpa.cpp \
+                kernel/qwindowsysteminterface_qpa.cpp \
+                kernel/qplatformintegration_qpa.cpp \
+                kernel/qplatformscreen_qpa.cpp \
+                kernel/qplatformintegrationfactory_qpa.cpp \
+                kernel/qplatformintegrationplugin_qpa.cpp \
+                kernel/qplatformwindow_qpa.cpp \
+                kernel/qplatformeventloopintegration_qpa.cpp \
+                kernel/qplatformglcontext_qpa.cpp \
+                kernel/qwindowcontext_qpa.cpp \
+                kernel/qplatformcursor_qpa.cpp \
+                kernel/qplatformclipboard_qpa.cpp \
+                kernel/qplatformnativeinterface_qpa.cpp \
+                kernel/qsessionmanager_qpa.cpp \
+                kernel/qwindowformat_qpa.cpp \
+                kernel/qguiapplication.cpp \
+                kernel/qwindow.cpp
+
+        contains(QT_CONFIG, glib) {
+            SOURCES += \
+                kernel/qeventdispatcher_glib_qpa.cpp
+            HEADERS += \
+                kernel/qeventdispatcher_glib_qpa_p.h
+            QMAKE_CXXFLAGS += $$QT_CFLAGS_GLIB
+            LIBS_PRIVATE +=$$QT_LIBS_GLIB
+	}
+}
diff --git a/src/gui/guikernel/qclipboard.cpp b/src/gui/kernel/qclipboard.cpp
index 83d1c9183a5..83d1c9183a5 100644
--- a/src/gui/guikernel/qclipboard.cpp
+++ b/src/gui/kernel/qclipboard.cpp
diff --git a/src/gui/guikernel/qclipboard.h b/src/gui/kernel/qclipboard.h
index 989ba19c2c9..989ba19c2c9 100644
--- a/src/gui/guikernel/qclipboard.h
+++ b/src/gui/kernel/qclipboard.h
diff --git a/src/gui/guikernel/qclipboard_p.h b/src/gui/kernel/qclipboard_p.h
index c82694cfb82..c82694cfb82 100644
--- a/src/gui/guikernel/qclipboard_p.h
+++ b/src/gui/kernel/qclipboard_p.h
diff --git a/src/gui/guikernel/qclipboard_qpa.cpp b/src/gui/kernel/qclipboard_qpa.cpp
index 6aa7c1d6d94..6aa7c1d6d94 100644
--- a/src/gui/guikernel/qclipboard_qpa.cpp
+++ b/src/gui/kernel/qclipboard_qpa.cpp
diff --git a/src/gui/guikernel/qcursor.cpp b/src/gui/kernel/qcursor.cpp
index be533a365f7..be533a365f7 100644
--- a/src/gui/guikernel/qcursor.cpp
+++ b/src/gui/kernel/qcursor.cpp
diff --git a/src/gui/guikernel/qcursor.h b/src/gui/kernel/qcursor.h
index b47ec04d66d..b47ec04d66d 100644
--- a/src/gui/guikernel/qcursor.h
+++ b/src/gui/kernel/qcursor.h
diff --git a/src/gui/guikernel/qcursor_p.h b/src/gui/kernel/qcursor_p.h
index 660a2a5e8b5..660a2a5e8b5 100644
--- a/src/gui/guikernel/qcursor_p.h
+++ b/src/gui/kernel/qcursor_p.h
diff --git a/src/gui/guikernel/qcursor_qpa.cpp b/src/gui/kernel/qcursor_qpa.cpp
index a6ae7d30f5a..a6ae7d30f5a 100644
--- a/src/gui/guikernel/qcursor_qpa.cpp
+++ b/src/gui/kernel/qcursor_qpa.cpp
diff --git a/src/gui/guikernel/qevent.cpp b/src/gui/kernel/qevent.cpp
index 2b2277dfd44..2b2277dfd44 100644
--- a/src/gui/guikernel/qevent.cpp
+++ b/src/gui/kernel/qevent.cpp
diff --git a/src/gui/guikernel/qevent.h b/src/gui/kernel/qevent.h
index 45b11d47953..45b11d47953 100644
--- a/src/gui/guikernel/qevent.h
+++ b/src/gui/kernel/qevent.h
diff --git a/src/gui/guikernel/qevent_p.h b/src/gui/kernel/qevent_p.h
index 38060ea4aed..38060ea4aed 100644
--- a/src/gui/guikernel/qevent_p.h
+++ b/src/gui/kernel/qevent_p.h
diff --git a/src/gui/guikernel/qeventdispatcher_glib_qpa.cpp b/src/gui/kernel/qeventdispatcher_glib_qpa.cpp
index b601e89bd7f..b601e89bd7f 100644
--- a/src/gui/guikernel/qeventdispatcher_glib_qpa.cpp
+++ b/src/gui/kernel/qeventdispatcher_glib_qpa.cpp
diff --git a/src/gui/guikernel/qeventdispatcher_glib_qpa_p.h b/src/gui/kernel/qeventdispatcher_glib_qpa_p.h
index 701f6735c4e..701f6735c4e 100644
--- a/src/gui/guikernel/qeventdispatcher_glib_qpa_p.h
+++ b/src/gui/kernel/qeventdispatcher_glib_qpa_p.h
diff --git a/src/gui/guikernel/qeventdispatcher_qpa.cpp b/src/gui/kernel/qeventdispatcher_qpa.cpp
index 690209a2652..690209a2652 100644
--- a/src/gui/guikernel/qeventdispatcher_qpa.cpp
+++ b/src/gui/kernel/qeventdispatcher_qpa.cpp
diff --git a/src/gui/guikernel/qeventdispatcher_qpa_p.h b/src/gui/kernel/qeventdispatcher_qpa_p.h
index d4d2be1f380..d4d2be1f380 100644
--- a/src/gui/guikernel/qeventdispatcher_qpa_p.h
+++ b/src/gui/kernel/qeventdispatcher_qpa_p.h
diff --git a/src/gui/guikernel/qgenericplugin_qpa.cpp b/src/gui/kernel/qgenericplugin_qpa.cpp
index 43d6525bb60..43d6525bb60 100644
--- a/src/gui/guikernel/qgenericplugin_qpa.cpp
+++ b/src/gui/kernel/qgenericplugin_qpa.cpp
diff --git a/src/gui/guikernel/qgenericplugin_qpa.h b/src/gui/kernel/qgenericplugin_qpa.h
index e1792cd417b..e1792cd417b 100644
--- a/src/gui/guikernel/qgenericplugin_qpa.h
+++ b/src/gui/kernel/qgenericplugin_qpa.h
diff --git a/src/gui/guikernel/qgenericpluginfactory_qpa.cpp b/src/gui/kernel/qgenericpluginfactory_qpa.cpp
index 2f747474283..2f747474283 100644
--- a/src/gui/guikernel/qgenericpluginfactory_qpa.cpp
+++ b/src/gui/kernel/qgenericpluginfactory_qpa.cpp
diff --git a/src/gui/guikernel/qgenericpluginfactory_qpa.h b/src/gui/kernel/qgenericpluginfactory_qpa.h
index 59eac386edd..59eac386edd 100644
--- a/src/gui/guikernel/qgenericpluginfactory_qpa.h
+++ b/src/gui/kernel/qgenericpluginfactory_qpa.h
diff --git a/src/gui/guikernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index 86fb7f5e1da..86fb7f5e1da 100644
--- a/src/gui/guikernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
diff --git a/src/gui/guikernel/qguiapplication.h b/src/gui/kernel/qguiapplication.h
index 1b2484519c8..1b2484519c8 100644
--- a/src/gui/guikernel/qguiapplication.h
+++ b/src/gui/kernel/qguiapplication.h
diff --git a/src/gui/guikernel/qguiapplication_p.h b/src/gui/kernel/qguiapplication_p.h
index dfe73a4c695..dfe73a4c695 100644
--- a/src/gui/guikernel/qguiapplication_p.h
+++ b/src/gui/kernel/qguiapplication_p.h
diff --git a/src/gui/guikernel/qguivariant.cpp b/src/gui/kernel/qguivariant.cpp
index c1e07e55a5b..c1e07e55a5b 100644
--- a/src/gui/guikernel/qguivariant.cpp
+++ b/src/gui/kernel/qguivariant.cpp
diff --git a/src/gui/guikernel/qkeymapper.cpp b/src/gui/kernel/qkeymapper.cpp
index 02e0231ecd3..02e0231ecd3 100644
--- a/src/gui/guikernel/qkeymapper.cpp
+++ b/src/gui/kernel/qkeymapper.cpp
diff --git a/src/gui/guikernel/qkeymapper_p.h b/src/gui/kernel/qkeymapper_p.h
index 03ba092deca..03ba092deca 100644
--- a/src/gui/guikernel/qkeymapper_p.h
+++ b/src/gui/kernel/qkeymapper_p.h
diff --git a/src/gui/guikernel/qkeymapper_qpa.cpp b/src/gui/kernel/qkeymapper_qpa.cpp
index 7e4114057f8..7e4114057f8 100644
--- a/src/gui/guikernel/qkeymapper_qpa.cpp
+++ b/src/gui/kernel/qkeymapper_qpa.cpp
diff --git a/src/gui/guikernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp
index 71661438e1e..71661438e1e 100644
--- a/src/gui/guikernel/qkeysequence.cpp
+++ b/src/gui/kernel/qkeysequence.cpp
diff --git a/src/gui/guikernel/qkeysequence.h b/src/gui/kernel/qkeysequence.h
index c61501036a0..c61501036a0 100644
--- a/src/gui/guikernel/qkeysequence.h
+++ b/src/gui/kernel/qkeysequence.h
diff --git a/src/gui/guikernel/qkeysequence_p.h b/src/gui/kernel/qkeysequence_p.h
index c1e59776635..c1e59776635 100644
--- a/src/gui/guikernel/qkeysequence_p.h
+++ b/src/gui/kernel/qkeysequence_p.h
diff --git a/src/gui/guikernel/qmime.cpp b/src/gui/kernel/qmime.cpp
index 4e15ddf6247..4e15ddf6247 100644
--- a/src/gui/guikernel/qmime.cpp
+++ b/src/gui/kernel/qmime.cpp
diff --git a/src/gui/guikernel/qmime.h b/src/gui/kernel/qmime.h
index a791f68cf00..a791f68cf00 100644
--- a/src/gui/guikernel/qmime.h
+++ b/src/gui/kernel/qmime.h
diff --git a/src/gui/guikernel/qpalette.cpp b/src/gui/kernel/qpalette.cpp
index 33b1c2a2a80..33b1c2a2a80 100644
--- a/src/gui/guikernel/qpalette.cpp
+++ b/src/gui/kernel/qpalette.cpp
diff --git a/src/gui/guikernel/qpalette.h b/src/gui/kernel/qpalette.h
index 17f3d0f6537..17f3d0f6537 100644
--- a/src/gui/guikernel/qpalette.h
+++ b/src/gui/kernel/qpalette.h
diff --git a/src/gui/guikernel/qplatformclipboard_qpa.cpp b/src/gui/kernel/qplatformclipboard_qpa.cpp
index 2da3892b2db..2da3892b2db 100644
--- a/src/gui/guikernel/qplatformclipboard_qpa.cpp
+++ b/src/gui/kernel/qplatformclipboard_qpa.cpp
diff --git a/src/gui/guikernel/qplatformclipboard_qpa.h b/src/gui/kernel/qplatformclipboard_qpa.h
index e1be8aa22f9..e1be8aa22f9 100644
--- a/src/gui/guikernel/qplatformclipboard_qpa.h
+++ b/src/gui/kernel/qplatformclipboard_qpa.h
diff --git a/src/gui/guikernel/qplatformcursor_qpa.cpp b/src/gui/kernel/qplatformcursor_qpa.cpp
index f43eca640f8..f43eca640f8 100644
--- a/src/gui/guikernel/qplatformcursor_qpa.cpp
+++ b/src/gui/kernel/qplatformcursor_qpa.cpp
diff --git a/src/gui/guikernel/qplatformcursor_qpa.h b/src/gui/kernel/qplatformcursor_qpa.h
index 48e13bb9545..48e13bb9545 100644
--- a/src/gui/guikernel/qplatformcursor_qpa.h
+++ b/src/gui/kernel/qplatformcursor_qpa.h
diff --git a/src/gui/guikernel/qplatformeventloopintegration_qpa.cpp b/src/gui/kernel/qplatformeventloopintegration_qpa.cpp
index 0ed43eb4b54..0ed43eb4b54 100644
--- a/src/gui/guikernel/qplatformeventloopintegration_qpa.cpp
+++ b/src/gui/kernel/qplatformeventloopintegration_qpa.cpp
diff --git a/src/gui/guikernel/qplatformeventloopintegration_qpa.h b/src/gui/kernel/qplatformeventloopintegration_qpa.h
index 87df7aefe47..87df7aefe47 100644
--- a/src/gui/guikernel/qplatformeventloopintegration_qpa.h
+++ b/src/gui/kernel/qplatformeventloopintegration_qpa.h
diff --git a/src/gui/guikernel/qplatformglcontext_qpa.cpp b/src/gui/kernel/qplatformglcontext_qpa.cpp
index 2177a01d9b4..2177a01d9b4 100644
--- a/src/gui/guikernel/qplatformglcontext_qpa.cpp
+++ b/src/gui/kernel/qplatformglcontext_qpa.cpp
diff --git a/src/gui/guikernel/qplatformglcontext_qpa.h b/src/gui/kernel/qplatformglcontext_qpa.h
index fbd43b2b480..fbd43b2b480 100644
--- a/src/gui/guikernel/qplatformglcontext_qpa.h
+++ b/src/gui/kernel/qplatformglcontext_qpa.h
diff --git a/src/gui/guikernel/qplatformintegration_qpa.cpp b/src/gui/kernel/qplatformintegration_qpa.cpp
index 9967a444c2f..9967a444c2f 100644
--- a/src/gui/guikernel/qplatformintegration_qpa.cpp
+++ b/src/gui/kernel/qplatformintegration_qpa.cpp
diff --git a/src/gui/guikernel/qplatformintegration_qpa.h b/src/gui/kernel/qplatformintegration_qpa.h
index eb29a4bd0da..eb29a4bd0da 100644
--- a/src/gui/guikernel/qplatformintegration_qpa.h
+++ b/src/gui/kernel/qplatformintegration_qpa.h
diff --git a/src/gui/guikernel/qplatformintegrationfactory_qpa.cpp b/src/gui/kernel/qplatformintegrationfactory_qpa.cpp
index e679800ef42..e679800ef42 100644
--- a/src/gui/guikernel/qplatformintegrationfactory_qpa.cpp
+++ b/src/gui/kernel/qplatformintegrationfactory_qpa.cpp
diff --git a/src/gui/guikernel/qplatformintegrationfactory_qpa_p.h b/src/gui/kernel/qplatformintegrationfactory_qpa_p.h
index a6042a81e0e..a6042a81e0e 100644
--- a/src/gui/guikernel/qplatformintegrationfactory_qpa_p.h
+++ b/src/gui/kernel/qplatformintegrationfactory_qpa_p.h
diff --git a/src/gui/guikernel/qplatformintegrationplugin_qpa.cpp b/src/gui/kernel/qplatformintegrationplugin_qpa.cpp
index 62920b69923..62920b69923 100644
--- a/src/gui/guikernel/qplatformintegrationplugin_qpa.cpp
+++ b/src/gui/kernel/qplatformintegrationplugin_qpa.cpp
diff --git a/src/gui/guikernel/qplatformintegrationplugin_qpa.h b/src/gui/kernel/qplatformintegrationplugin_qpa.h
index 17bcba0e467..17bcba0e467 100644
--- a/src/gui/guikernel/qplatformintegrationplugin_qpa.h
+++ b/src/gui/kernel/qplatformintegrationplugin_qpa.h
diff --git a/src/gui/guikernel/qplatformnativeinterface_qpa.cpp b/src/gui/kernel/qplatformnativeinterface_qpa.cpp
index f160ec28998..f160ec28998 100644
--- a/src/gui/guikernel/qplatformnativeinterface_qpa.cpp
+++ b/src/gui/kernel/qplatformnativeinterface_qpa.cpp
diff --git a/src/gui/guikernel/qplatformnativeinterface_qpa.h b/src/gui/kernel/qplatformnativeinterface_qpa.h
index ff3eacf2e01..ff3eacf2e01 100644
--- a/src/gui/guikernel/qplatformnativeinterface_qpa.h
+++ b/src/gui/kernel/qplatformnativeinterface_qpa.h
diff --git a/src/gui/guikernel/qplatformscreen_qpa.cpp b/src/gui/kernel/qplatformscreen_qpa.cpp
index 8759aa4a88c..8759aa4a88c 100644
--- a/src/gui/guikernel/qplatformscreen_qpa.cpp
+++ b/src/gui/kernel/qplatformscreen_qpa.cpp
diff --git a/src/gui/guikernel/qplatformscreen_qpa.h b/src/gui/kernel/qplatformscreen_qpa.h
index 9492788b4f3..9492788b4f3 100644
--- a/src/gui/guikernel/qplatformscreen_qpa.h
+++ b/src/gui/kernel/qplatformscreen_qpa.h
diff --git a/src/gui/guikernel/qplatformwindow_qpa.cpp b/src/gui/kernel/qplatformwindow_qpa.cpp
index 24c337cf579..24c337cf579 100644
--- a/src/gui/guikernel/qplatformwindow_qpa.cpp
+++ b/src/gui/kernel/qplatformwindow_qpa.cpp
diff --git a/src/gui/guikernel/qplatformwindow_qpa.h b/src/gui/kernel/qplatformwindow_qpa.h
index 1730f3d85e3..1730f3d85e3 100644
--- a/src/gui/guikernel/qplatformwindow_qpa.h
+++ b/src/gui/kernel/qplatformwindow_qpa.h
diff --git a/src/gui/guikernel/qsessionmanager.h b/src/gui/kernel/qsessionmanager.h
index 66ca0b82826..66ca0b82826 100644
--- a/src/gui/guikernel/qsessionmanager.h
+++ b/src/gui/kernel/qsessionmanager.h
diff --git a/src/gui/guikernel/qsessionmanager_qpa.cpp b/src/gui/kernel/qsessionmanager_qpa.cpp
index 1b4e6a612be..1b4e6a612be 100644
--- a/src/gui/guikernel/qsessionmanager_qpa.cpp
+++ b/src/gui/kernel/qsessionmanager_qpa.cpp
diff --git a/src/gui/guikernel/qt_gui_pch.h b/src/gui/kernel/qt_gui_pch.h
index 79450219fa7..79450219fa7 100644
--- a/src/gui/guikernel/qt_gui_pch.h
+++ b/src/gui/kernel/qt_gui_pch.h
diff --git a/src/gui/guikernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp
index 7faf49395a4..7faf49395a4 100644
--- a/src/gui/guikernel/qwindow.cpp
+++ b/src/gui/kernel/qwindow.cpp
diff --git a/src/gui/guikernel/qwindow.h b/src/gui/kernel/qwindow.h
index f2fde2d5322..f2fde2d5322 100644
--- a/src/gui/guikernel/qwindow.h
+++ b/src/gui/kernel/qwindow.h
diff --git a/src/gui/guikernel/qwindow_p.h b/src/gui/kernel/qwindow_p.h
index 6f1038e8c42..6f1038e8c42 100644
--- a/src/gui/guikernel/qwindow_p.h
+++ b/src/gui/kernel/qwindow_p.h
diff --git a/src/gui/guikernel/qwindowcontext_qpa.cpp b/src/gui/kernel/qwindowcontext_qpa.cpp
index f121e846b2d..f121e846b2d 100644
--- a/src/gui/guikernel/qwindowcontext_qpa.cpp
+++ b/src/gui/kernel/qwindowcontext_qpa.cpp
diff --git a/src/gui/guikernel/qwindowcontext_qpa.h b/src/gui/kernel/qwindowcontext_qpa.h
index c16666a7f4d..c16666a7f4d 100644
--- a/src/gui/guikernel/qwindowcontext_qpa.h
+++ b/src/gui/kernel/qwindowcontext_qpa.h
diff --git a/src/gui/guikernel/qwindowdefs.h b/src/gui/kernel/qwindowdefs.h
index b9fea38da83..b9fea38da83 100644
--- a/src/gui/guikernel/qwindowdefs.h
+++ b/src/gui/kernel/qwindowdefs.h
diff --git a/src/gui/guikernel/qwindowformat_qpa.cpp b/src/gui/kernel/qwindowformat_qpa.cpp
index 03ccba7b075..03ccba7b075 100644
--- a/src/gui/guikernel/qwindowformat_qpa.cpp
+++ b/src/gui/kernel/qwindowformat_qpa.cpp
diff --git a/src/gui/guikernel/qwindowformat_qpa.h b/src/gui/kernel/qwindowformat_qpa.h
index 9bc2ccdfaab..9bc2ccdfaab 100644
--- a/src/gui/guikernel/qwindowformat_qpa.h
+++ b/src/gui/kernel/qwindowformat_qpa.h
diff --git a/src/gui/guikernel/qwindowsysteminterface_qpa.cpp b/src/gui/kernel/qwindowsysteminterface_qpa.cpp
index aece0fec188..aece0fec188 100644
--- a/src/gui/guikernel/qwindowsysteminterface_qpa.cpp
+++ b/src/gui/kernel/qwindowsysteminterface_qpa.cpp
diff --git a/src/gui/guikernel/qwindowsysteminterface_qpa.h b/src/gui/kernel/qwindowsysteminterface_qpa.h
index bd8139933cd..bd8139933cd 100644
--- a/src/gui/guikernel/qwindowsysteminterface_qpa.h
+++ b/src/gui/kernel/qwindowsysteminterface_qpa.h
diff --git a/src/gui/guikernel/qwindowsysteminterface_qpa_p.h b/src/gui/kernel/qwindowsysteminterface_qpa_p.h
index 30adecc405b..30adecc405b 100644
--- a/src/gui/guikernel/qwindowsysteminterface_qpa_p.h
+++ b/src/gui/kernel/qwindowsysteminterface_qpa_p.h
diff --git a/src/gui/guiutil/qdesktopservices.cpp b/src/gui/util/qdesktopservices.cpp
index 2c2c3308ca3..2c2c3308ca3 100644
--- a/src/gui/guiutil/qdesktopservices.cpp
+++ b/src/gui/util/qdesktopservices.cpp
diff --git a/src/gui/guiutil/qdesktopservices.h b/src/gui/util/qdesktopservices.h
index 9d5657ecca3..9d5657ecca3 100644
--- a/src/gui/guiutil/qdesktopservices.h
+++ b/src/gui/util/qdesktopservices.h
diff --git a/src/gui/guiutil/qdesktopservices_mac.cpp b/src/gui/util/qdesktopservices_mac.cpp
index e9868471cb1..e9868471cb1 100644
--- a/src/gui/guiutil/qdesktopservices_mac.cpp
+++ b/src/gui/util/qdesktopservices_mac.cpp
diff --git a/src/gui/guiutil/qdesktopservices_qpa.cpp b/src/gui/util/qdesktopservices_qpa.cpp
index 324fa51a626..324fa51a626 100644
--- a/src/gui/guiutil/qdesktopservices_qpa.cpp
+++ b/src/gui/util/qdesktopservices_qpa.cpp
diff --git a/src/gui/guiutil/qdesktopservices_s60.cpp b/src/gui/util/qdesktopservices_s60.cpp
index 8caeb74fec3..8caeb74fec3 100644
--- a/src/gui/guiutil/qdesktopservices_s60.cpp
+++ b/src/gui/util/qdesktopservices_s60.cpp
diff --git a/src/gui/guiutil/qdesktopservices_win.cpp b/src/gui/util/qdesktopservices_win.cpp
index 783970ba82c..783970ba82c 100644
--- a/src/gui/guiutil/qdesktopservices_win.cpp
+++ b/src/gui/util/qdesktopservices_win.cpp
diff --git a/src/gui/guiutil/qdesktopservices_x11.cpp b/src/gui/util/qdesktopservices_x11.cpp
index e685bed0b99..e685bed0b99 100644
--- a/src/gui/guiutil/qdesktopservices_x11.cpp
+++ b/src/gui/util/qdesktopservices_x11.cpp
diff --git a/src/gui/guiutil/qhexstring_p.h b/src/gui/util/qhexstring_p.h
index 3c8d5627565..3c8d5627565 100644
--- a/src/gui/guiutil/qhexstring_p.h
+++ b/src/gui/util/qhexstring_p.h
diff --git a/src/gui/guiutil/qvalidator.cpp b/src/gui/util/qvalidator.cpp
index a76f7bb6e8d..a76f7bb6e8d 100644
--- a/src/gui/guiutil/qvalidator.cpp
+++ b/src/gui/util/qvalidator.cpp
diff --git a/src/gui/guiutil/qvalidator.h b/src/gui/util/qvalidator.h
index 5a0162afd53..5a0162afd53 100644
--- a/src/gui/guiutil/qvalidator.h
+++ b/src/gui/util/qvalidator.h
diff --git a/src/gui/util/util.pri b/src/gui/util/util.pri
new file mode 100644
index 00000000000..dfb221667ef
--- /dev/null
+++ b/src/gui/util/util.pri
@@ -0,0 +1,10 @@
+# Qt util module
+
+HEADERS += \
+        util/qdesktopservices.h \
+        util/qhexstring_p.h \
+        util/qvalidator.h
+
+SOURCES += \
+        util/qdesktopservices.cpp \
+        util/qvalidator.cpp