moving some more files around.

src/gui/image/image.pri

@@ -5,11 +5,6 @@
 
 HEADERS += \
         image/qbitmap.h \
-        image/qicon.h \
-        image/qicon_p.h \
-        image/qiconloader_p.h \
-        image/qiconengine.h \
-        image/qiconengineplugin.h \
         image/qimage.h \
         image/qimage_p.h \
         image/qimageiohandler.h \
@@ -36,8 +31,6 @@ HEADERS += \
 
 SOURCES += \
         image/qbitmap.cpp \
-        image/qicon.cpp \
-        image/qiconloader.cpp \
         image/qimage.cpp \
         image/qimageiohandler.cpp \
         image/qimagereader.cpp \
@@ -50,8 +43,6 @@ SOURCES += \
         image/qpixmapdata.cpp \
         image/qpixmapdatafactory.cpp \
         image/qpixmapfilter.cpp \
-        image/qiconengine.cpp \
-        image/qiconengineplugin.cpp \
         image/qmovie.cpp \
         image/qpixmap_raster.cpp \
         image/qpixmap_blitter.cpp \

src/gui/kernel/kernel.pri

@@ -16,7 +16,12 @@ HEADERS += \
 	kernel/qdesktopwidget.h \
 	kernel/qformlayout.h \
 	kernel/qgridlayout.h \
-	kernel/qlayout.h \
+        kernel/qicon.h \
+        kernel/qicon_p.h \
+        kernel/qiconloader_p.h \
+        kernel/qiconengine.h \
+        kernel/qiconengineplugin.h \
+        kernel/qlayout.h \
 	kernel/qlayout_p.h \
 	kernel/qlayoutengine_p.h \
 	kernel/qlayoutitem.h \
@@ -46,7 +51,11 @@ SOURCES += \
         kernel/qboxlayout.cpp \
 	kernel/qformlayout.cpp \
 	kernel/qgridlayout.cpp \
-	kernel/qlayout.cpp \
+        kernel/qicon.cpp \
+        kernel/qiconloader.cpp \
+        kernel/qiconengine.cpp \
+        kernel/qiconengineplugin.cpp \
+        kernel/qlayout.cpp \
 	kernel/qlayoutengine.cpp \
 	kernel/qlayoutitem.cpp \
         kernel/qpalette.cpp \

src/gui/text/text.pri

@@ -9,7 +9,8 @@ HEADERS += \
 	text/qfontmetrics.h \
 	text/qfont_p.h \
 	text/qfontsubset_p.h \
-	text/qtextcontrol_p.h \
+        text/qlinecontrol_p.h \
+        text/qtextcontrol_p.h \
 	text/qtextcontrol_p_p.h \
 	text/qtextengine_p.h \
 	text/qtextlayout.h \
@@ -51,7 +52,8 @@ SOURCES += \
 	text/qfontsubset.cpp \
 	text/qfontmetrics.cpp \
 	text/qfontdatabase.cpp \
-	text/qtextcontrol.cpp \
+        text/qlinecontrol.cpp \
+        text/qtextcontrol.cpp \
 	text/qtextengine.cpp \
 	text/qtextlayout.cpp \
 	text/qtextformat.cpp \

src/gui/widgets/widgets.pri

@@ -30,7 +30,6 @@ HEADERS += \
         widgets/qlcdnumber.h \
         widgets/qlineedit.h \
         widgets/qlineedit_p.h \
-        widgets/qlinecontrol_p.h \
         widgets/qmainwindow.h \
         widgets/qmainwindowlayout_p.h \
         widgets/qmdiarea.h \
@@ -103,7 +102,6 @@ SOURCES += \
         widgets/qlcdnumber.cpp \
         widgets/qlineedit_p.cpp \
         widgets/qlineedit.cpp \
-        widgets/qlinecontrol.cpp \
         widgets/qmainwindow.cpp \
         widgets/qmainwindowlayout.cpp \
         widgets/qmdiarea.cpp \