diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2011-05-04 13:08:02 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@nokia.com> | 2011-05-04 13:08:02 +0200 |
commit | 3e8b53a46ce8c54de17b0ae6bf5a6fa3eacaa143 (patch) | |
tree | c7555544a618f148c40bab5b59932ecab39c774f | |
parent | 401f078386a8b5a87a58e237de7be9a2f9a045ba (diff) |
moving some more files around.
-rw-r--r-- | src/gui/image/image.pri | 9 | ||||
-rw-r--r-- | src/gui/kernel/kernel.pri | 13 | ||||
-rw-r--r-- | src/gui/kernel/qicon.cpp (renamed from src/gui/image/qicon.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qicon.h (renamed from src/gui/image/qicon.h) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qicon_p.h (renamed from src/gui/image/qicon_p.h) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qiconengine.cpp (renamed from src/gui/image/qiconengine.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qiconengine.h (renamed from src/gui/image/qiconengine.h) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qiconengineplugin.cpp (renamed from src/gui/image/qiconengineplugin.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qiconengineplugin.h (renamed from src/gui/image/qiconengineplugin.h) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qiconloader.cpp (renamed from src/gui/image/qiconloader.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qiconloader_p.h (renamed from src/gui/image/qiconloader_p.h) | 0 | ||||
-rw-r--r-- | src/gui/text/qlinecontrol.cpp (renamed from src/gui/widgets/qlinecontrol.cpp) | 0 | ||||
-rw-r--r-- | src/gui/text/qlinecontrol_p.h (renamed from src/gui/widgets/qlinecontrol_p.h) | 0 | ||||
-rw-r--r-- | src/gui/text/text.pri | 6 | ||||
-rw-r--r-- | src/gui/widgets/widgets.pri | 2 |
15 files changed, 15 insertions, 15 deletions
diff --git a/src/gui/image/image.pri b/src/gui/image/image.pri index e970fb05a1..f9e0fa449a 100644 --- a/src/gui/image/image.pri +++ b/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 \ diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri index c2559b1225..d32533dbc1 100644 --- a/src/gui/kernel/kernel.pri +++ b/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 \ diff --git a/src/gui/image/qicon.cpp b/src/gui/kernel/qicon.cpp index 59687c709d..59687c709d 100644 --- a/src/gui/image/qicon.cpp +++ b/src/gui/kernel/qicon.cpp diff --git a/src/gui/image/qicon.h b/src/gui/kernel/qicon.h index 4e3960925e..4e3960925e 100644 --- a/src/gui/image/qicon.h +++ b/src/gui/kernel/qicon.h diff --git a/src/gui/image/qicon_p.h b/src/gui/kernel/qicon_p.h index 0bf7e65cc1..0bf7e65cc1 100644 --- a/src/gui/image/qicon_p.h +++ b/src/gui/kernel/qicon_p.h diff --git a/src/gui/image/qiconengine.cpp b/src/gui/kernel/qiconengine.cpp index 6168a83940..6168a83940 100644 --- a/src/gui/image/qiconengine.cpp +++ b/src/gui/kernel/qiconengine.cpp diff --git a/src/gui/image/qiconengine.h b/src/gui/kernel/qiconengine.h index 12caea8a20..12caea8a20 100644 --- a/src/gui/image/qiconengine.h +++ b/src/gui/kernel/qiconengine.h diff --git a/src/gui/image/qiconengineplugin.cpp b/src/gui/kernel/qiconengineplugin.cpp index 7c8c3a3c1a..7c8c3a3c1a 100644 --- a/src/gui/image/qiconengineplugin.cpp +++ b/src/gui/kernel/qiconengineplugin.cpp diff --git a/src/gui/image/qiconengineplugin.h b/src/gui/kernel/qiconengineplugin.h index e892a38f7b..e892a38f7b 100644 --- a/src/gui/image/qiconengineplugin.h +++ b/src/gui/kernel/qiconengineplugin.h diff --git a/src/gui/image/qiconloader.cpp b/src/gui/kernel/qiconloader.cpp index 19be636e9c..19be636e9c 100644 --- a/src/gui/image/qiconloader.cpp +++ b/src/gui/kernel/qiconloader.cpp diff --git a/src/gui/image/qiconloader_p.h b/src/gui/kernel/qiconloader_p.h index 00a3976b40..00a3976b40 100644 --- a/src/gui/image/qiconloader_p.h +++ b/src/gui/kernel/qiconloader_p.h diff --git a/src/gui/widgets/qlinecontrol.cpp b/src/gui/text/qlinecontrol.cpp index eb4e142328..eb4e142328 100644 --- a/src/gui/widgets/qlinecontrol.cpp +++ b/src/gui/text/qlinecontrol.cpp diff --git a/src/gui/widgets/qlinecontrol_p.h b/src/gui/text/qlinecontrol_p.h index 0042f17261..0042f17261 100644 --- a/src/gui/widgets/qlinecontrol_p.h +++ b/src/gui/text/qlinecontrol_p.h diff --git a/src/gui/text/text.pri b/src/gui/text/text.pri index ba6ddb32f0..7a9aee62fd 100644 --- a/src/gui/text/text.pri +++ b/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 \ diff --git a/src/gui/widgets/widgets.pri b/src/gui/widgets/widgets.pri index 4cbcbe3983..9797d6c717 100644 --- a/src/gui/widgets/widgets.pri +++ b/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 \ |