From e577d02cc9cba2033cd21c23a4420a1f0d5469a4 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Sun, 8 May 2011 20:51:18 +0200 Subject: [PATCH] move files in src/gui into their final locations Rename the guikernel subdir to kernel and guiutil to util. --- src/gui/gui.pro | 5 +- src/gui/guikernel/guikernel.pri | 88 ------------------- src/gui/guiutil/guiutil.pri | 10 --- src/gui/kernel/kernel.pri | 88 +++++++++++++++++++ src/gui/{guikernel => kernel}/qclipboard.cpp | 0 src/gui/{guikernel => kernel}/qclipboard.h | 0 src/gui/{guikernel => kernel}/qclipboard_p.h | 0 .../{guikernel => kernel}/qclipboard_qpa.cpp | 0 src/gui/{guikernel => kernel}/qcursor.cpp | 0 src/gui/{guikernel => kernel}/qcursor.h | 0 src/gui/{guikernel => kernel}/qcursor_p.h | 0 src/gui/{guikernel => kernel}/qcursor_qpa.cpp | 0 src/gui/{guikernel => kernel}/qevent.cpp | 0 src/gui/{guikernel => kernel}/qevent.h | 0 src/gui/{guikernel => kernel}/qevent_p.h | 0 .../qeventdispatcher_glib_qpa.cpp | 0 .../qeventdispatcher_glib_qpa_p.h | 0 .../qeventdispatcher_qpa.cpp | 0 .../qeventdispatcher_qpa_p.h | 0 .../qgenericplugin_qpa.cpp | 0 .../qgenericplugin_qpa.h | 0 .../qgenericpluginfactory_qpa.cpp | 0 .../qgenericpluginfactory_qpa.h | 0 .../{guikernel => kernel}/qguiapplication.cpp | 0 .../{guikernel => kernel}/qguiapplication.h | 0 .../{guikernel => kernel}/qguiapplication_p.h | 0 src/gui/{guikernel => kernel}/qguivariant.cpp | 0 src/gui/{guikernel => kernel}/qkeymapper.cpp | 0 src/gui/{guikernel => kernel}/qkeymapper_p.h | 0 .../{guikernel => kernel}/qkeymapper_qpa.cpp | 0 .../{guikernel => kernel}/qkeysequence.cpp | 0 src/gui/{guikernel => kernel}/qkeysequence.h | 0 .../{guikernel => kernel}/qkeysequence_p.h | 0 src/gui/{guikernel => kernel}/qmime.cpp | 0 src/gui/{guikernel => kernel}/qmime.h | 0 src/gui/{guikernel => kernel}/qpalette.cpp | 0 src/gui/{guikernel => kernel}/qpalette.h | 0 .../qplatformclipboard_qpa.cpp | 0 .../qplatformclipboard_qpa.h | 0 .../qplatformcursor_qpa.cpp | 0 .../qplatformcursor_qpa.h | 0 .../qplatformeventloopintegration_qpa.cpp | 0 .../qplatformeventloopintegration_qpa.h | 0 .../qplatformglcontext_qpa.cpp | 0 .../qplatformglcontext_qpa.h | 0 .../qplatformintegration_qpa.cpp | 0 .../qplatformintegration_qpa.h | 0 .../qplatformintegrationfactory_qpa.cpp | 0 .../qplatformintegrationfactory_qpa_p.h | 0 .../qplatformintegrationplugin_qpa.cpp | 0 .../qplatformintegrationplugin_qpa.h | 0 .../qplatformnativeinterface_qpa.cpp | 0 .../qplatformnativeinterface_qpa.h | 0 .../qplatformscreen_qpa.cpp | 0 .../qplatformscreen_qpa.h | 0 .../qplatformwindow_qpa.cpp | 0 .../qplatformwindow_qpa.h | 0 .../{guikernel => kernel}/qsessionmanager.h | 0 .../qsessionmanager_qpa.cpp | 0 src/gui/{guikernel => kernel}/qt_gui_pch.h | 0 src/gui/{guikernel => kernel}/qwindow.cpp | 0 src/gui/{guikernel => kernel}/qwindow.h | 0 src/gui/{guikernel => kernel}/qwindow_p.h | 0 .../qwindowcontext_qpa.cpp | 0 .../qwindowcontext_qpa.h | 0 src/gui/{guikernel => kernel}/qwindowdefs.h | 0 .../qwindowformat_qpa.cpp | 0 .../{guikernel => kernel}/qwindowformat_qpa.h | 0 .../qwindowsysteminterface_qpa.cpp | 0 .../qwindowsysteminterface_qpa.h | 0 .../qwindowsysteminterface_qpa_p.h | 0 .../{guiutil => util}/qdesktopservices.cpp | 0 src/gui/{guiutil => util}/qdesktopservices.h | 0 .../qdesktopservices_mac.cpp | 0 .../qdesktopservices_qpa.cpp | 0 .../qdesktopservices_s60.cpp | 0 .../qdesktopservices_win.cpp | 0 .../qdesktopservices_x11.cpp | 0 src/gui/{guiutil => util}/qhexstring_p.h | 0 src/gui/{guiutil => util}/qvalidator.cpp | 0 src/gui/{guiutil => util}/qvalidator.h | 0 src/gui/util/util.pri | 10 +++ 82 files changed, 100 insertions(+), 101 deletions(-) delete mode 100644 src/gui/guikernel/guikernel.pri delete mode 100644 src/gui/guiutil/guiutil.pri create mode 100644 src/gui/kernel/kernel.pri rename src/gui/{guikernel => kernel}/qclipboard.cpp (100%) rename src/gui/{guikernel => kernel}/qclipboard.h (100%) rename src/gui/{guikernel => kernel}/qclipboard_p.h (100%) rename src/gui/{guikernel => kernel}/qclipboard_qpa.cpp (100%) rename src/gui/{guikernel => kernel}/qcursor.cpp (100%) rename src/gui/{guikernel => kernel}/qcursor.h (100%) rename src/gui/{guikernel => kernel}/qcursor_p.h (100%) rename src/gui/{guikernel => kernel}/qcursor_qpa.cpp (100%) rename src/gui/{guikernel => kernel}/qevent.cpp (100%) rename src/gui/{guikernel => kernel}/qevent.h (100%) rename src/gui/{guikernel => kernel}/qevent_p.h (100%) rename src/gui/{guikernel => kernel}/qeventdispatcher_glib_qpa.cpp (100%) rename src/gui/{guikernel => kernel}/qeventdispatcher_glib_qpa_p.h (100%) rename src/gui/{guikernel => kernel}/qeventdispatcher_qpa.cpp (100%) rename src/gui/{guikernel => kernel}/qeventdispatcher_qpa_p.h (100%) rename src/gui/{guikernel => kernel}/qgenericplugin_qpa.cpp (100%) rename src/gui/{guikernel => kernel}/qgenericplugin_qpa.h (100%) rename src/gui/{guikernel => kernel}/qgenericpluginfactory_qpa.cpp (100%) rename src/gui/{guikernel => kernel}/qgenericpluginfactory_qpa.h (100%) rename src/gui/{guikernel => kernel}/qguiapplication.cpp (100%) rename src/gui/{guikernel => kernel}/qguiapplication.h (100%) rename src/gui/{guikernel => kernel}/qguiapplication_p.h (100%) rename src/gui/{guikernel => kernel}/qguivariant.cpp (100%) rename src/gui/{guikernel => kernel}/qkeymapper.cpp (100%) rename src/gui/{guikernel => kernel}/qkeymapper_p.h (100%) rename src/gui/{guikernel => kernel}/qkeymapper_qpa.cpp (100%) rename src/gui/{guikernel => kernel}/qkeysequence.cpp (100%) rename src/gui/{guikernel => kernel}/qkeysequence.h (100%) rename src/gui/{guikernel => kernel}/qkeysequence_p.h (100%) rename src/gui/{guikernel => kernel}/qmime.cpp (100%) rename src/gui/{guikernel => kernel}/qmime.h (100%) rename src/gui/{guikernel => kernel}/qpalette.cpp (100%) rename src/gui/{guikernel => kernel}/qpalette.h (100%) rename src/gui/{guikernel => kernel}/qplatformclipboard_qpa.cpp (100%) rename src/gui/{guikernel => kernel}/qplatformclipboard_qpa.h (100%) rename src/gui/{guikernel => kernel}/qplatformcursor_qpa.cpp (100%) rename src/gui/{guikernel => kernel}/qplatformcursor_qpa.h (100%) rename src/gui/{guikernel => kernel}/qplatformeventloopintegration_qpa.cpp (100%) rename src/gui/{guikernel => kernel}/qplatformeventloopintegration_qpa.h (100%) rename src/gui/{guikernel => kernel}/qplatformglcontext_qpa.cpp (100%) rename src/gui/{guikernel => kernel}/qplatformglcontext_qpa.h (100%) rename src/gui/{guikernel => kernel}/qplatformintegration_qpa.cpp (100%) rename src/gui/{guikernel => kernel}/qplatformintegration_qpa.h (100%) rename src/gui/{guikernel => kernel}/qplatformintegrationfactory_qpa.cpp (100%) rename src/gui/{guikernel => kernel}/qplatformintegrationfactory_qpa_p.h (100%) rename src/gui/{guikernel => kernel}/qplatformintegrationplugin_qpa.cpp (100%) rename src/gui/{guikernel => kernel}/qplatformintegrationplugin_qpa.h (100%) rename src/gui/{guikernel => kernel}/qplatformnativeinterface_qpa.cpp (100%) rename src/gui/{guikernel => kernel}/qplatformnativeinterface_qpa.h (100%) rename src/gui/{guikernel => kernel}/qplatformscreen_qpa.cpp (100%) rename src/gui/{guikernel => kernel}/qplatformscreen_qpa.h (100%) rename src/gui/{guikernel => kernel}/qplatformwindow_qpa.cpp (100%) rename src/gui/{guikernel => kernel}/qplatformwindow_qpa.h (100%) rename src/gui/{guikernel => kernel}/qsessionmanager.h (100%) rename src/gui/{guikernel => kernel}/qsessionmanager_qpa.cpp (100%) rename src/gui/{guikernel => kernel}/qt_gui_pch.h (100%) rename src/gui/{guikernel => kernel}/qwindow.cpp (100%) rename src/gui/{guikernel => kernel}/qwindow.h (100%) rename src/gui/{guikernel => kernel}/qwindow_p.h (100%) rename src/gui/{guikernel => kernel}/qwindowcontext_qpa.cpp (100%) rename src/gui/{guikernel => kernel}/qwindowcontext_qpa.h (100%) rename src/gui/{guikernel => kernel}/qwindowdefs.h (100%) rename src/gui/{guikernel => kernel}/qwindowformat_qpa.cpp (100%) rename src/gui/{guikernel => kernel}/qwindowformat_qpa.h (100%) rename src/gui/{guikernel => kernel}/qwindowsysteminterface_qpa.cpp (100%) rename src/gui/{guikernel => kernel}/qwindowsysteminterface_qpa.h (100%) rename src/gui/{guikernel => kernel}/qwindowsysteminterface_qpa_p.h (100%) rename src/gui/{guiutil => util}/qdesktopservices.cpp (100%) rename src/gui/{guiutil => util}/qdesktopservices.h (100%) rename src/gui/{guiutil => util}/qdesktopservices_mac.cpp (100%) rename src/gui/{guiutil => util}/qdesktopservices_qpa.cpp (100%) rename src/gui/{guiutil => util}/qdesktopservices_s60.cpp (100%) rename src/gui/{guiutil => util}/qdesktopservices_win.cpp (100%) rename src/gui/{guiutil => util}/qdesktopservices_x11.cpp (100%) rename src/gui/{guiutil => util}/qhexstring_p.h (100%) rename src/gui/{guiutil => util}/qvalidator.cpp (100%) rename src/gui/{guiutil => util}/qvalidator.h (100%) create mode 100644 src/gui/util/util.pri diff --git a/src/gui/gui.pro b/src/gui/gui.pro index f9ae32b6b5e..c4a73f4e130 100644 --- a/src/gui/gui.pro +++ b/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(guikernel/guikernel.pri) +include(kernel/kernel.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) diff --git a/src/gui/guikernel/guikernel.pri b/src/gui/guikernel/guikernel.pri deleted file mode 100644 index 8e41b550495..00000000000 --- a/src/gui/guikernel/guikernel.pri +++ /dev/null @@ -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 - } -} diff --git a/src/gui/guiutil/guiutil.pri b/src/gui/guiutil/guiutil.pri deleted file mode 100644 index 95ec2cfc0fa..00000000000 --- a/src/gui/guiutil/guiutil.pri +++ /dev/null @@ -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 diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri new file mode 100644 index 00000000000..6fda4fd62f2 --- /dev/null +++ b/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 + } +} diff --git a/src/gui/guikernel/qclipboard.cpp b/src/gui/kernel/qclipboard.cpp similarity index 100% rename from src/gui/guikernel/qclipboard.cpp rename to src/gui/kernel/qclipboard.cpp diff --git a/src/gui/guikernel/qclipboard.h b/src/gui/kernel/qclipboard.h similarity index 100% rename from src/gui/guikernel/qclipboard.h rename to src/gui/kernel/qclipboard.h diff --git a/src/gui/guikernel/qclipboard_p.h b/src/gui/kernel/qclipboard_p.h similarity index 100% rename from src/gui/guikernel/qclipboard_p.h rename to src/gui/kernel/qclipboard_p.h diff --git a/src/gui/guikernel/qclipboard_qpa.cpp b/src/gui/kernel/qclipboard_qpa.cpp similarity index 100% rename from src/gui/guikernel/qclipboard_qpa.cpp rename to src/gui/kernel/qclipboard_qpa.cpp diff --git a/src/gui/guikernel/qcursor.cpp b/src/gui/kernel/qcursor.cpp similarity index 100% rename from src/gui/guikernel/qcursor.cpp rename to src/gui/kernel/qcursor.cpp diff --git a/src/gui/guikernel/qcursor.h b/src/gui/kernel/qcursor.h similarity index 100% rename from src/gui/guikernel/qcursor.h rename to src/gui/kernel/qcursor.h diff --git a/src/gui/guikernel/qcursor_p.h b/src/gui/kernel/qcursor_p.h similarity index 100% rename from src/gui/guikernel/qcursor_p.h rename to src/gui/kernel/qcursor_p.h diff --git a/src/gui/guikernel/qcursor_qpa.cpp b/src/gui/kernel/qcursor_qpa.cpp similarity index 100% rename from src/gui/guikernel/qcursor_qpa.cpp rename to src/gui/kernel/qcursor_qpa.cpp diff --git a/src/gui/guikernel/qevent.cpp b/src/gui/kernel/qevent.cpp similarity index 100% rename from src/gui/guikernel/qevent.cpp rename to src/gui/kernel/qevent.cpp diff --git a/src/gui/guikernel/qevent.h b/src/gui/kernel/qevent.h similarity index 100% rename from src/gui/guikernel/qevent.h rename to src/gui/kernel/qevent.h diff --git a/src/gui/guikernel/qevent_p.h b/src/gui/kernel/qevent_p.h similarity index 100% rename from src/gui/guikernel/qevent_p.h rename to src/gui/kernel/qevent_p.h diff --git a/src/gui/guikernel/qeventdispatcher_glib_qpa.cpp b/src/gui/kernel/qeventdispatcher_glib_qpa.cpp similarity index 100% rename from src/gui/guikernel/qeventdispatcher_glib_qpa.cpp rename to src/gui/kernel/qeventdispatcher_glib_qpa.cpp diff --git a/src/gui/guikernel/qeventdispatcher_glib_qpa_p.h b/src/gui/kernel/qeventdispatcher_glib_qpa_p.h similarity index 100% rename from src/gui/guikernel/qeventdispatcher_glib_qpa_p.h rename to src/gui/kernel/qeventdispatcher_glib_qpa_p.h diff --git a/src/gui/guikernel/qeventdispatcher_qpa.cpp b/src/gui/kernel/qeventdispatcher_qpa.cpp similarity index 100% rename from src/gui/guikernel/qeventdispatcher_qpa.cpp rename to src/gui/kernel/qeventdispatcher_qpa.cpp diff --git a/src/gui/guikernel/qeventdispatcher_qpa_p.h b/src/gui/kernel/qeventdispatcher_qpa_p.h similarity index 100% rename from src/gui/guikernel/qeventdispatcher_qpa_p.h rename to src/gui/kernel/qeventdispatcher_qpa_p.h diff --git a/src/gui/guikernel/qgenericplugin_qpa.cpp b/src/gui/kernel/qgenericplugin_qpa.cpp similarity index 100% rename from src/gui/guikernel/qgenericplugin_qpa.cpp rename to src/gui/kernel/qgenericplugin_qpa.cpp diff --git a/src/gui/guikernel/qgenericplugin_qpa.h b/src/gui/kernel/qgenericplugin_qpa.h similarity index 100% rename from src/gui/guikernel/qgenericplugin_qpa.h rename to src/gui/kernel/qgenericplugin_qpa.h diff --git a/src/gui/guikernel/qgenericpluginfactory_qpa.cpp b/src/gui/kernel/qgenericpluginfactory_qpa.cpp similarity index 100% rename from src/gui/guikernel/qgenericpluginfactory_qpa.cpp rename to src/gui/kernel/qgenericpluginfactory_qpa.cpp diff --git a/src/gui/guikernel/qgenericpluginfactory_qpa.h b/src/gui/kernel/qgenericpluginfactory_qpa.h similarity index 100% rename from src/gui/guikernel/qgenericpluginfactory_qpa.h rename to src/gui/kernel/qgenericpluginfactory_qpa.h diff --git a/src/gui/guikernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp similarity index 100% rename from src/gui/guikernel/qguiapplication.cpp rename to src/gui/kernel/qguiapplication.cpp diff --git a/src/gui/guikernel/qguiapplication.h b/src/gui/kernel/qguiapplication.h similarity index 100% rename from src/gui/guikernel/qguiapplication.h rename to src/gui/kernel/qguiapplication.h diff --git a/src/gui/guikernel/qguiapplication_p.h b/src/gui/kernel/qguiapplication_p.h similarity index 100% rename from src/gui/guikernel/qguiapplication_p.h rename to src/gui/kernel/qguiapplication_p.h diff --git a/src/gui/guikernel/qguivariant.cpp b/src/gui/kernel/qguivariant.cpp similarity index 100% rename from src/gui/guikernel/qguivariant.cpp rename to src/gui/kernel/qguivariant.cpp diff --git a/src/gui/guikernel/qkeymapper.cpp b/src/gui/kernel/qkeymapper.cpp similarity index 100% rename from src/gui/guikernel/qkeymapper.cpp rename to src/gui/kernel/qkeymapper.cpp diff --git a/src/gui/guikernel/qkeymapper_p.h b/src/gui/kernel/qkeymapper_p.h similarity index 100% rename from src/gui/guikernel/qkeymapper_p.h rename to src/gui/kernel/qkeymapper_p.h diff --git a/src/gui/guikernel/qkeymapper_qpa.cpp b/src/gui/kernel/qkeymapper_qpa.cpp similarity index 100% rename from src/gui/guikernel/qkeymapper_qpa.cpp rename to src/gui/kernel/qkeymapper_qpa.cpp diff --git a/src/gui/guikernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp similarity index 100% rename from src/gui/guikernel/qkeysequence.cpp rename to src/gui/kernel/qkeysequence.cpp diff --git a/src/gui/guikernel/qkeysequence.h b/src/gui/kernel/qkeysequence.h similarity index 100% rename from src/gui/guikernel/qkeysequence.h rename to src/gui/kernel/qkeysequence.h diff --git a/src/gui/guikernel/qkeysequence_p.h b/src/gui/kernel/qkeysequence_p.h similarity index 100% rename from src/gui/guikernel/qkeysequence_p.h rename to src/gui/kernel/qkeysequence_p.h diff --git a/src/gui/guikernel/qmime.cpp b/src/gui/kernel/qmime.cpp similarity index 100% rename from src/gui/guikernel/qmime.cpp rename to src/gui/kernel/qmime.cpp diff --git a/src/gui/guikernel/qmime.h b/src/gui/kernel/qmime.h similarity index 100% rename from src/gui/guikernel/qmime.h rename to src/gui/kernel/qmime.h diff --git a/src/gui/guikernel/qpalette.cpp b/src/gui/kernel/qpalette.cpp similarity index 100% rename from src/gui/guikernel/qpalette.cpp rename to src/gui/kernel/qpalette.cpp diff --git a/src/gui/guikernel/qpalette.h b/src/gui/kernel/qpalette.h similarity index 100% rename from src/gui/guikernel/qpalette.h rename to src/gui/kernel/qpalette.h diff --git a/src/gui/guikernel/qplatformclipboard_qpa.cpp b/src/gui/kernel/qplatformclipboard_qpa.cpp similarity index 100% rename from src/gui/guikernel/qplatformclipboard_qpa.cpp rename to src/gui/kernel/qplatformclipboard_qpa.cpp diff --git a/src/gui/guikernel/qplatformclipboard_qpa.h b/src/gui/kernel/qplatformclipboard_qpa.h similarity index 100% rename from src/gui/guikernel/qplatformclipboard_qpa.h rename to src/gui/kernel/qplatformclipboard_qpa.h diff --git a/src/gui/guikernel/qplatformcursor_qpa.cpp b/src/gui/kernel/qplatformcursor_qpa.cpp similarity index 100% rename from src/gui/guikernel/qplatformcursor_qpa.cpp rename to src/gui/kernel/qplatformcursor_qpa.cpp diff --git a/src/gui/guikernel/qplatformcursor_qpa.h b/src/gui/kernel/qplatformcursor_qpa.h similarity index 100% rename from src/gui/guikernel/qplatformcursor_qpa.h rename to src/gui/kernel/qplatformcursor_qpa.h diff --git a/src/gui/guikernel/qplatformeventloopintegration_qpa.cpp b/src/gui/kernel/qplatformeventloopintegration_qpa.cpp similarity index 100% rename from src/gui/guikernel/qplatformeventloopintegration_qpa.cpp rename to src/gui/kernel/qplatformeventloopintegration_qpa.cpp diff --git a/src/gui/guikernel/qplatformeventloopintegration_qpa.h b/src/gui/kernel/qplatformeventloopintegration_qpa.h similarity index 100% rename from src/gui/guikernel/qplatformeventloopintegration_qpa.h rename to src/gui/kernel/qplatformeventloopintegration_qpa.h diff --git a/src/gui/guikernel/qplatformglcontext_qpa.cpp b/src/gui/kernel/qplatformglcontext_qpa.cpp similarity index 100% rename from src/gui/guikernel/qplatformglcontext_qpa.cpp rename to src/gui/kernel/qplatformglcontext_qpa.cpp diff --git a/src/gui/guikernel/qplatformglcontext_qpa.h b/src/gui/kernel/qplatformglcontext_qpa.h similarity index 100% rename from src/gui/guikernel/qplatformglcontext_qpa.h rename to src/gui/kernel/qplatformglcontext_qpa.h diff --git a/src/gui/guikernel/qplatformintegration_qpa.cpp b/src/gui/kernel/qplatformintegration_qpa.cpp similarity index 100% rename from src/gui/guikernel/qplatformintegration_qpa.cpp rename to src/gui/kernel/qplatformintegration_qpa.cpp diff --git a/src/gui/guikernel/qplatformintegration_qpa.h b/src/gui/kernel/qplatformintegration_qpa.h similarity index 100% rename from src/gui/guikernel/qplatformintegration_qpa.h rename to src/gui/kernel/qplatformintegration_qpa.h diff --git a/src/gui/guikernel/qplatformintegrationfactory_qpa.cpp b/src/gui/kernel/qplatformintegrationfactory_qpa.cpp similarity index 100% rename from src/gui/guikernel/qplatformintegrationfactory_qpa.cpp rename to src/gui/kernel/qplatformintegrationfactory_qpa.cpp diff --git a/src/gui/guikernel/qplatformintegrationfactory_qpa_p.h b/src/gui/kernel/qplatformintegrationfactory_qpa_p.h similarity index 100% rename from src/gui/guikernel/qplatformintegrationfactory_qpa_p.h rename to src/gui/kernel/qplatformintegrationfactory_qpa_p.h diff --git a/src/gui/guikernel/qplatformintegrationplugin_qpa.cpp b/src/gui/kernel/qplatformintegrationplugin_qpa.cpp similarity index 100% rename from src/gui/guikernel/qplatformintegrationplugin_qpa.cpp rename to src/gui/kernel/qplatformintegrationplugin_qpa.cpp diff --git a/src/gui/guikernel/qplatformintegrationplugin_qpa.h b/src/gui/kernel/qplatformintegrationplugin_qpa.h similarity index 100% rename from src/gui/guikernel/qplatformintegrationplugin_qpa.h rename to src/gui/kernel/qplatformintegrationplugin_qpa.h diff --git a/src/gui/guikernel/qplatformnativeinterface_qpa.cpp b/src/gui/kernel/qplatformnativeinterface_qpa.cpp similarity index 100% rename from src/gui/guikernel/qplatformnativeinterface_qpa.cpp rename to src/gui/kernel/qplatformnativeinterface_qpa.cpp diff --git a/src/gui/guikernel/qplatformnativeinterface_qpa.h b/src/gui/kernel/qplatformnativeinterface_qpa.h similarity index 100% rename from src/gui/guikernel/qplatformnativeinterface_qpa.h rename to src/gui/kernel/qplatformnativeinterface_qpa.h diff --git a/src/gui/guikernel/qplatformscreen_qpa.cpp b/src/gui/kernel/qplatformscreen_qpa.cpp similarity index 100% rename from src/gui/guikernel/qplatformscreen_qpa.cpp rename to src/gui/kernel/qplatformscreen_qpa.cpp diff --git a/src/gui/guikernel/qplatformscreen_qpa.h b/src/gui/kernel/qplatformscreen_qpa.h similarity index 100% rename from src/gui/guikernel/qplatformscreen_qpa.h rename to src/gui/kernel/qplatformscreen_qpa.h diff --git a/src/gui/guikernel/qplatformwindow_qpa.cpp b/src/gui/kernel/qplatformwindow_qpa.cpp similarity index 100% rename from src/gui/guikernel/qplatformwindow_qpa.cpp rename to src/gui/kernel/qplatformwindow_qpa.cpp diff --git a/src/gui/guikernel/qplatformwindow_qpa.h b/src/gui/kernel/qplatformwindow_qpa.h similarity index 100% rename from src/gui/guikernel/qplatformwindow_qpa.h rename to src/gui/kernel/qplatformwindow_qpa.h diff --git a/src/gui/guikernel/qsessionmanager.h b/src/gui/kernel/qsessionmanager.h similarity index 100% rename from src/gui/guikernel/qsessionmanager.h rename to src/gui/kernel/qsessionmanager.h diff --git a/src/gui/guikernel/qsessionmanager_qpa.cpp b/src/gui/kernel/qsessionmanager_qpa.cpp similarity index 100% rename from src/gui/guikernel/qsessionmanager_qpa.cpp rename to src/gui/kernel/qsessionmanager_qpa.cpp diff --git a/src/gui/guikernel/qt_gui_pch.h b/src/gui/kernel/qt_gui_pch.h similarity index 100% rename from src/gui/guikernel/qt_gui_pch.h rename to src/gui/kernel/qt_gui_pch.h diff --git a/src/gui/guikernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp similarity index 100% rename from src/gui/guikernel/qwindow.cpp rename to src/gui/kernel/qwindow.cpp diff --git a/src/gui/guikernel/qwindow.h b/src/gui/kernel/qwindow.h similarity index 100% rename from src/gui/guikernel/qwindow.h rename to src/gui/kernel/qwindow.h diff --git a/src/gui/guikernel/qwindow_p.h b/src/gui/kernel/qwindow_p.h similarity index 100% rename from src/gui/guikernel/qwindow_p.h rename to src/gui/kernel/qwindow_p.h diff --git a/src/gui/guikernel/qwindowcontext_qpa.cpp b/src/gui/kernel/qwindowcontext_qpa.cpp similarity index 100% rename from src/gui/guikernel/qwindowcontext_qpa.cpp rename to src/gui/kernel/qwindowcontext_qpa.cpp diff --git a/src/gui/guikernel/qwindowcontext_qpa.h b/src/gui/kernel/qwindowcontext_qpa.h similarity index 100% rename from src/gui/guikernel/qwindowcontext_qpa.h rename to src/gui/kernel/qwindowcontext_qpa.h diff --git a/src/gui/guikernel/qwindowdefs.h b/src/gui/kernel/qwindowdefs.h similarity index 100% rename from src/gui/guikernel/qwindowdefs.h rename to src/gui/kernel/qwindowdefs.h diff --git a/src/gui/guikernel/qwindowformat_qpa.cpp b/src/gui/kernel/qwindowformat_qpa.cpp similarity index 100% rename from src/gui/guikernel/qwindowformat_qpa.cpp rename to src/gui/kernel/qwindowformat_qpa.cpp diff --git a/src/gui/guikernel/qwindowformat_qpa.h b/src/gui/kernel/qwindowformat_qpa.h similarity index 100% rename from src/gui/guikernel/qwindowformat_qpa.h rename to src/gui/kernel/qwindowformat_qpa.h diff --git a/src/gui/guikernel/qwindowsysteminterface_qpa.cpp b/src/gui/kernel/qwindowsysteminterface_qpa.cpp similarity index 100% rename from src/gui/guikernel/qwindowsysteminterface_qpa.cpp rename to src/gui/kernel/qwindowsysteminterface_qpa.cpp diff --git a/src/gui/guikernel/qwindowsysteminterface_qpa.h b/src/gui/kernel/qwindowsysteminterface_qpa.h similarity index 100% rename from src/gui/guikernel/qwindowsysteminterface_qpa.h rename to src/gui/kernel/qwindowsysteminterface_qpa.h diff --git a/src/gui/guikernel/qwindowsysteminterface_qpa_p.h b/src/gui/kernel/qwindowsysteminterface_qpa_p.h similarity index 100% rename from src/gui/guikernel/qwindowsysteminterface_qpa_p.h rename to src/gui/kernel/qwindowsysteminterface_qpa_p.h diff --git a/src/gui/guiutil/qdesktopservices.cpp b/src/gui/util/qdesktopservices.cpp similarity index 100% rename from src/gui/guiutil/qdesktopservices.cpp rename to src/gui/util/qdesktopservices.cpp diff --git a/src/gui/guiutil/qdesktopservices.h b/src/gui/util/qdesktopservices.h similarity index 100% rename from src/gui/guiutil/qdesktopservices.h rename to src/gui/util/qdesktopservices.h diff --git a/src/gui/guiutil/qdesktopservices_mac.cpp b/src/gui/util/qdesktopservices_mac.cpp similarity index 100% rename from src/gui/guiutil/qdesktopservices_mac.cpp rename to src/gui/util/qdesktopservices_mac.cpp diff --git a/src/gui/guiutil/qdesktopservices_qpa.cpp b/src/gui/util/qdesktopservices_qpa.cpp similarity index 100% rename from src/gui/guiutil/qdesktopservices_qpa.cpp rename to src/gui/util/qdesktopservices_qpa.cpp diff --git a/src/gui/guiutil/qdesktopservices_s60.cpp b/src/gui/util/qdesktopservices_s60.cpp similarity index 100% rename from src/gui/guiutil/qdesktopservices_s60.cpp rename to src/gui/util/qdesktopservices_s60.cpp diff --git a/src/gui/guiutil/qdesktopservices_win.cpp b/src/gui/util/qdesktopservices_win.cpp similarity index 100% rename from src/gui/guiutil/qdesktopservices_win.cpp rename to src/gui/util/qdesktopservices_win.cpp diff --git a/src/gui/guiutil/qdesktopservices_x11.cpp b/src/gui/util/qdesktopservices_x11.cpp similarity index 100% rename from src/gui/guiutil/qdesktopservices_x11.cpp rename to src/gui/util/qdesktopservices_x11.cpp diff --git a/src/gui/guiutil/qhexstring_p.h b/src/gui/util/qhexstring_p.h similarity index 100% rename from src/gui/guiutil/qhexstring_p.h rename to src/gui/util/qhexstring_p.h diff --git a/src/gui/guiutil/qvalidator.cpp b/src/gui/util/qvalidator.cpp similarity index 100% rename from src/gui/guiutil/qvalidator.cpp rename to src/gui/util/qvalidator.cpp diff --git a/src/gui/guiutil/qvalidator.h b/src/gui/util/qvalidator.h similarity index 100% rename from src/gui/guiutil/qvalidator.h rename to src/gui/util/qvalidator.h diff --git a/src/gui/util/util.pri b/src/gui/util/util.pri new file mode 100644 index 00000000000..dfb221667ef --- /dev/null +++ b/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