move files in src/gui into their final locations

Rename the guikernel subdir to kernel
and guiutil to util.

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(kernel/kernel.pri)
-include(guikernel/guikernel.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)

src/gui/guikernel/guikernel.pri

@@ -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
-	}
-}

src/gui/guiutil/guiutil.pri

@@ -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

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
+	}
+}

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