From 326bd84c8429f11e12850ee3aa4693ab1848233d Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Thu, 5 May 2011 12:23:13 +0200 Subject: [PATCH] move some more files into proper places --- src/gui/gui.pro | 1 + src/gui/guikernel/guikernel.pri | 3 +-- src/gui/{util => guiutil}/qdesktopservices.cpp | 0 src/gui/{util => guiutil}/qdesktopservices.h | 0 src/gui/{util => guiutil}/qdesktopservices_mac.cpp | 0 src/gui/{util => guiutil}/qdesktopservices_qpa.cpp | 0 src/gui/{util => guiutil}/qdesktopservices_s60.cpp | 0 src/gui/{util => guiutil}/qdesktopservices_win.cpp | 0 src/gui/{util => guiutil}/qdesktopservices_x11.cpp | 0 src/gui/{guikernel => guiutil}/qhexstring_p.h | 0 src/gui/{widgets => guiutil}/qvalidator.cpp | 0 src/gui/{widgets => guiutil}/qvalidator.h | 0 src/gui/util/util.pri | 2 -- src/gui/widgets/widgets.pri | 2 -- 14 files changed, 2 insertions(+), 6 deletions(-) rename src/gui/{util => guiutil}/qdesktopservices.cpp (100%) rename src/gui/{util => guiutil}/qdesktopservices.h (100%) rename src/gui/{util => guiutil}/qdesktopservices_mac.cpp (100%) rename src/gui/{util => guiutil}/qdesktopservices_qpa.cpp (100%) rename src/gui/{util => guiutil}/qdesktopservices_s60.cpp (100%) rename src/gui/{util => guiutil}/qdesktopservices_win.cpp (100%) rename src/gui/{util => guiutil}/qdesktopservices_x11.cpp (100%) rename src/gui/{guikernel => guiutil}/qhexstring_p.h (100%) rename src/gui/{widgets => guiutil}/qvalidator.cpp (100%) rename src/gui/{widgets => guiutil}/qvalidator.h (100%) diff --git a/src/gui/gui.pro b/src/gui/gui.pro index 534c01e..488378b 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -31,6 +31,7 @@ include(guikernel/guikernel.pri) include(image/image.pri) include(text/text.pri) include(painting/painting.pri) +include(guiutil/guiutil.pri) #modules include(animation/animation.pri) diff --git a/src/gui/guikernel/guikernel.pri b/src/gui/guikernel/guikernel.pri index 50b8554..23cb385 100644 --- a/src/gui/guikernel/guikernel.pri +++ b/src/gui/guikernel/guikernel.pri @@ -18,8 +18,7 @@ HEADERS += \ guikernel/qshortcut.h \ guikernel/qshortcutmap_p.h \ guikernel/qwindowdefs.h \ - guikernel/qkeymapper_p.h \ - guikernel/qhexstring_p.h + guikernel/qkeymapper_p.h SOURCES += \ guikernel/qclipboard.cpp \ diff --git a/src/gui/util/qdesktopservices.cpp b/src/gui/guiutil/qdesktopservices.cpp similarity index 100% rename from src/gui/util/qdesktopservices.cpp rename to src/gui/guiutil/qdesktopservices.cpp diff --git a/src/gui/util/qdesktopservices.h b/src/gui/guiutil/qdesktopservices.h similarity index 100% rename from src/gui/util/qdesktopservices.h rename to src/gui/guiutil/qdesktopservices.h diff --git a/src/gui/util/qdesktopservices_mac.cpp b/src/gui/guiutil/qdesktopservices_mac.cpp similarity index 100% rename from src/gui/util/qdesktopservices_mac.cpp rename to src/gui/guiutil/qdesktopservices_mac.cpp diff --git a/src/gui/util/qdesktopservices_qpa.cpp b/src/gui/guiutil/qdesktopservices_qpa.cpp similarity index 100% rename from src/gui/util/qdesktopservices_qpa.cpp rename to src/gui/guiutil/qdesktopservices_qpa.cpp diff --git a/src/gui/util/qdesktopservices_s60.cpp b/src/gui/guiutil/qdesktopservices_s60.cpp similarity index 100% rename from src/gui/util/qdesktopservices_s60.cpp rename to src/gui/guiutil/qdesktopservices_s60.cpp diff --git a/src/gui/util/qdesktopservices_win.cpp b/src/gui/guiutil/qdesktopservices_win.cpp similarity index 100% rename from src/gui/util/qdesktopservices_win.cpp rename to src/gui/guiutil/qdesktopservices_win.cpp diff --git a/src/gui/util/qdesktopservices_x11.cpp b/src/gui/guiutil/qdesktopservices_x11.cpp similarity index 100% rename from src/gui/util/qdesktopservices_x11.cpp rename to src/gui/guiutil/qdesktopservices_x11.cpp diff --git a/src/gui/guikernel/qhexstring_p.h b/src/gui/guiutil/qhexstring_p.h similarity index 100% rename from src/gui/guikernel/qhexstring_p.h rename to src/gui/guiutil/qhexstring_p.h diff --git a/src/gui/widgets/qvalidator.cpp b/src/gui/guiutil/qvalidator.cpp similarity index 100% rename from src/gui/widgets/qvalidator.cpp rename to src/gui/guiutil/qvalidator.cpp diff --git a/src/gui/widgets/qvalidator.h b/src/gui/guiutil/qvalidator.h similarity index 100% rename from src/gui/widgets/qvalidator.h rename to src/gui/guiutil/qvalidator.h diff --git a/src/gui/util/util.pri b/src/gui/util/util.pri index db8e065..854964b 100644 --- a/src/gui/util/util.pri +++ b/src/gui/util/util.pri @@ -4,7 +4,6 @@ HEADERS += \ util/qsystemtrayicon.h \ util/qcompleter.h \ util/qcompleter_p.h \ - util/qdesktopservices.h \ util/qsystemtrayicon_p.h \ util/qscroller.h \ util/qscroller_p.h \ @@ -19,7 +18,6 @@ HEADERS += \ SOURCES += \ util/qsystemtrayicon.cpp \ util/qcompleter.cpp \ - util/qdesktopservices.cpp \ util/qscroller.cpp \ util/qscrollerproperties.cpp \ util/qflickgesture.cpp \ diff --git a/src/gui/widgets/widgets.pri b/src/gui/widgets/widgets.pri index 9797d6c..a991ff1 100644 --- a/src/gui/widgets/widgets.pri +++ b/src/gui/widgets/widgets.pri @@ -69,7 +69,6 @@ HEADERS += \ widgets/qtoolbarseparator_p.h \ widgets/qtoolbox.h \ widgets/qtoolbutton.h \ - widgets/qvalidator.h \ widgets/qabstractscrollarea.h \ widgets/qabstractscrollarea_p.h \ widgets/qwidgetresizehandler_p.h \ @@ -131,7 +130,6 @@ SOURCES += \ widgets/qtoolbarseparator.cpp \ widgets/qtoolbox.cpp \ widgets/qtoolbutton.cpp \ - widgets/qvalidator.cpp \ widgets/qabstractscrollarea.cpp \ widgets/qwidgetresizehandler.cpp \ widgets/qfocusframe.cpp \ -- 2.7.4