diff options
-rw-r--r-- | src/gui/gui.pro | 1 | ||||
-rw-r--r-- | src/gui/guikernel/guikernel.pri | 3 | ||||
-rw-r--r-- | src/gui/guiutil/qdesktopservices.cpp (renamed from src/gui/util/qdesktopservices.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guiutil/qdesktopservices.h (renamed from src/gui/util/qdesktopservices.h) | 0 | ||||
-rw-r--r-- | src/gui/guiutil/qdesktopservices_mac.cpp (renamed from src/gui/util/qdesktopservices_mac.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guiutil/qdesktopservices_qpa.cpp (renamed from src/gui/util/qdesktopservices_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guiutil/qdesktopservices_s60.cpp (renamed from src/gui/util/qdesktopservices_s60.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guiutil/qdesktopservices_win.cpp (renamed from src/gui/util/qdesktopservices_win.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guiutil/qdesktopservices_x11.cpp (renamed from src/gui/util/qdesktopservices_x11.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guiutil/qhexstring_p.h (renamed from src/gui/guikernel/qhexstring_p.h) | 0 | ||||
-rw-r--r-- | src/gui/guiutil/qvalidator.cpp (renamed from src/gui/widgets/qvalidator.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guiutil/qvalidator.h (renamed from src/gui/widgets/qvalidator.h) | 0 | ||||
-rw-r--r-- | src/gui/util/util.pri | 2 | ||||
-rw-r--r-- | src/gui/widgets/widgets.pri | 2 |
14 files changed, 2 insertions, 6 deletions
diff --git a/src/gui/gui.pro b/src/gui/gui.pro index 534c01ef53..488378b0c6 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 50b8554b0f..23cb385f9e 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 index 2c2c3308ca..2c2c3308ca 100644 --- a/src/gui/util/qdesktopservices.cpp +++ b/src/gui/guiutil/qdesktopservices.cpp diff --git a/src/gui/util/qdesktopservices.h b/src/gui/guiutil/qdesktopservices.h index 9d5657ecca..9d5657ecca 100644 --- a/src/gui/util/qdesktopservices.h +++ b/src/gui/guiutil/qdesktopservices.h diff --git a/src/gui/util/qdesktopservices_mac.cpp b/src/gui/guiutil/qdesktopservices_mac.cpp index e9868471cb..e9868471cb 100644 --- a/src/gui/util/qdesktopservices_mac.cpp +++ b/src/gui/guiutil/qdesktopservices_mac.cpp diff --git a/src/gui/util/qdesktopservices_qpa.cpp b/src/gui/guiutil/qdesktopservices_qpa.cpp index 324fa51a62..324fa51a62 100644 --- a/src/gui/util/qdesktopservices_qpa.cpp +++ b/src/gui/guiutil/qdesktopservices_qpa.cpp diff --git a/src/gui/util/qdesktopservices_s60.cpp b/src/gui/guiutil/qdesktopservices_s60.cpp index 8caeb74fec..8caeb74fec 100644 --- a/src/gui/util/qdesktopservices_s60.cpp +++ b/src/gui/guiutil/qdesktopservices_s60.cpp diff --git a/src/gui/util/qdesktopservices_win.cpp b/src/gui/guiutil/qdesktopservices_win.cpp index 783970ba82..783970ba82 100644 --- a/src/gui/util/qdesktopservices_win.cpp +++ b/src/gui/guiutil/qdesktopservices_win.cpp diff --git a/src/gui/util/qdesktopservices_x11.cpp b/src/gui/guiutil/qdesktopservices_x11.cpp index e685bed0b9..e685bed0b9 100644 --- a/src/gui/util/qdesktopservices_x11.cpp +++ b/src/gui/guiutil/qdesktopservices_x11.cpp diff --git a/src/gui/guikernel/qhexstring_p.h b/src/gui/guiutil/qhexstring_p.h index 3c8d562756..3c8d562756 100644 --- a/src/gui/guikernel/qhexstring_p.h +++ b/src/gui/guiutil/qhexstring_p.h diff --git a/src/gui/widgets/qvalidator.cpp b/src/gui/guiutil/qvalidator.cpp index a76f7bb6e8..a76f7bb6e8 100644 --- a/src/gui/widgets/qvalidator.cpp +++ b/src/gui/guiutil/qvalidator.cpp diff --git a/src/gui/widgets/qvalidator.h b/src/gui/guiutil/qvalidator.h index 5a0162afd5..5a0162afd5 100644 --- a/src/gui/widgets/qvalidator.h +++ b/src/gui/guiutil/qvalidator.h diff --git a/src/gui/util/util.pri b/src/gui/util/util.pri index db8e06555f..854964b784 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 9797d6c717..a991ff1fac 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 \ |