diff options
-rw-r--r-- | src/gui/gui.pro | 5 | ||||
-rw-r--r-- | src/gui/guikernel/guikernel.pri | 88 | ||||
-rw-r--r-- | src/gui/guiutil/guiutil.pri | 10 | ||||
-rw-r--r-- | src/gui/kernel/kernel.pri | 88 | ||||
-rw-r--r-- | src/gui/kernel/qclipboard.cpp (renamed from src/gui/guikernel/qclipboard.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qclipboard.h (renamed from src/gui/guikernel/qclipboard.h) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qclipboard_p.h (renamed from src/gui/guikernel/qclipboard_p.h) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qclipboard_qpa.cpp (renamed from src/gui/guikernel/qclipboard_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qcursor.cpp (renamed from src/gui/guikernel/qcursor.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qcursor.h (renamed from src/gui/guikernel/qcursor.h) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qcursor_p.h (renamed from src/gui/guikernel/qcursor_p.h) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qcursor_qpa.cpp (renamed from src/gui/guikernel/qcursor_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qevent.cpp (renamed from src/gui/guikernel/qevent.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qevent.h (renamed from src/gui/guikernel/qevent.h) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qevent_p.h (renamed from src/gui/guikernel/qevent_p.h) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qeventdispatcher_glib_qpa.cpp (renamed from src/gui/guikernel/qeventdispatcher_glib_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qeventdispatcher_glib_qpa_p.h (renamed from src/gui/guikernel/qeventdispatcher_glib_qpa_p.h) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qeventdispatcher_qpa.cpp (renamed from src/gui/guikernel/qeventdispatcher_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qeventdispatcher_qpa_p.h (renamed from src/gui/guikernel/qeventdispatcher_qpa_p.h) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qgenericplugin_qpa.cpp (renamed from src/gui/guikernel/qgenericplugin_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qgenericplugin_qpa.h (renamed from src/gui/guikernel/qgenericplugin_qpa.h) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qgenericpluginfactory_qpa.cpp (renamed from src/gui/guikernel/qgenericpluginfactory_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qgenericpluginfactory_qpa.h (renamed from src/gui/guikernel/qgenericpluginfactory_qpa.h) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qguiapplication.cpp (renamed from src/gui/guikernel/qguiapplication.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qguiapplication.h (renamed from src/gui/guikernel/qguiapplication.h) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qguiapplication_p.h (renamed from src/gui/guikernel/qguiapplication_p.h) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qguivariant.cpp (renamed from src/gui/guikernel/qguivariant.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qkeymapper.cpp (renamed from src/gui/guikernel/qkeymapper.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qkeymapper_p.h (renamed from src/gui/guikernel/qkeymapper_p.h) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qkeymapper_qpa.cpp (renamed from src/gui/guikernel/qkeymapper_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qkeysequence.cpp (renamed from src/gui/guikernel/qkeysequence.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qkeysequence.h (renamed from src/gui/guikernel/qkeysequence.h) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qkeysequence_p.h (renamed from src/gui/guikernel/qkeysequence_p.h) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qmime.cpp (renamed from src/gui/guikernel/qmime.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qmime.h (renamed from src/gui/guikernel/qmime.h) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qpalette.cpp (renamed from src/gui/guikernel/qpalette.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qpalette.h (renamed from src/gui/guikernel/qpalette.h) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qplatformclipboard_qpa.cpp (renamed from src/gui/guikernel/qplatformclipboard_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qplatformclipboard_qpa.h (renamed from src/gui/guikernel/qplatformclipboard_qpa.h) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qplatformcursor_qpa.cpp (renamed from src/gui/guikernel/qplatformcursor_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qplatformcursor_qpa.h (renamed from src/gui/guikernel/qplatformcursor_qpa.h) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qplatformeventloopintegration_qpa.cpp (renamed from src/gui/guikernel/qplatformeventloopintegration_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qplatformeventloopintegration_qpa.h (renamed from src/gui/guikernel/qplatformeventloopintegration_qpa.h) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qplatformglcontext_qpa.cpp (renamed from src/gui/guikernel/qplatformglcontext_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qplatformglcontext_qpa.h (renamed from src/gui/guikernel/qplatformglcontext_qpa.h) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qplatformintegration_qpa.cpp (renamed from src/gui/guikernel/qplatformintegration_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qplatformintegration_qpa.h (renamed from src/gui/guikernel/qplatformintegration_qpa.h) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qplatformintegrationfactory_qpa.cpp (renamed from src/gui/guikernel/qplatformintegrationfactory_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qplatformintegrationfactory_qpa_p.h (renamed from src/gui/guikernel/qplatformintegrationfactory_qpa_p.h) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qplatformintegrationplugin_qpa.cpp (renamed from src/gui/guikernel/qplatformintegrationplugin_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qplatformintegrationplugin_qpa.h (renamed from src/gui/guikernel/qplatformintegrationplugin_qpa.h) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qplatformnativeinterface_qpa.cpp (renamed from src/gui/guikernel/qplatformnativeinterface_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qplatformnativeinterface_qpa.h (renamed from src/gui/guikernel/qplatformnativeinterface_qpa.h) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qplatformscreen_qpa.cpp (renamed from src/gui/guikernel/qplatformscreen_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qplatformscreen_qpa.h (renamed from src/gui/guikernel/qplatformscreen_qpa.h) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qplatformwindow_qpa.cpp (renamed from src/gui/guikernel/qplatformwindow_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qplatformwindow_qpa.h (renamed from src/gui/guikernel/qplatformwindow_qpa.h) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qsessionmanager.h (renamed from src/gui/guikernel/qsessionmanager.h) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qsessionmanager_qpa.cpp (renamed from src/gui/guikernel/qsessionmanager_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qt_gui_pch.h (renamed from src/gui/guikernel/qt_gui_pch.h) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qwindow.cpp (renamed from src/gui/guikernel/qwindow.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qwindow.h (renamed from src/gui/guikernel/qwindow.h) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qwindow_p.h (renamed from src/gui/guikernel/qwindow_p.h) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qwindowcontext_qpa.cpp (renamed from src/gui/guikernel/qwindowcontext_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qwindowcontext_qpa.h (renamed from src/gui/guikernel/qwindowcontext_qpa.h) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qwindowdefs.h (renamed from src/gui/guikernel/qwindowdefs.h) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qwindowformat_qpa.cpp (renamed from src/gui/guikernel/qwindowformat_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qwindowformat_qpa.h (renamed from src/gui/guikernel/qwindowformat_qpa.h) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qwindowsysteminterface_qpa.cpp (renamed from src/gui/guikernel/qwindowsysteminterface_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qwindowsysteminterface_qpa.h (renamed from src/gui/guikernel/qwindowsysteminterface_qpa.h) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qwindowsysteminterface_qpa_p.h (renamed from src/gui/guikernel/qwindowsysteminterface_qpa_p.h) | 0 | ||||
-rw-r--r-- | src/gui/util/qdesktopservices.cpp (renamed from src/gui/guiutil/qdesktopservices.cpp) | 0 | ||||
-rw-r--r-- | src/gui/util/qdesktopservices.h (renamed from src/gui/guiutil/qdesktopservices.h) | 0 | ||||
-rw-r--r-- | src/gui/util/qdesktopservices_mac.cpp (renamed from src/gui/guiutil/qdesktopservices_mac.cpp) | 0 | ||||
-rw-r--r-- | src/gui/util/qdesktopservices_qpa.cpp (renamed from src/gui/guiutil/qdesktopservices_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/util/qdesktopservices_s60.cpp (renamed from src/gui/guiutil/qdesktopservices_s60.cpp) | 0 | ||||
-rw-r--r-- | src/gui/util/qdesktopservices_win.cpp (renamed from src/gui/guiutil/qdesktopservices_win.cpp) | 0 | ||||
-rw-r--r-- | src/gui/util/qdesktopservices_x11.cpp (renamed from src/gui/guiutil/qdesktopservices_x11.cpp) | 0 | ||||
-rw-r--r-- | src/gui/util/qhexstring_p.h (renamed from src/gui/guiutil/qhexstring_p.h) | 0 | ||||
-rw-r--r-- | src/gui/util/qvalidator.cpp (renamed from src/gui/guiutil/qvalidator.cpp) | 0 | ||||
-rw-r--r-- | src/gui/util/qvalidator.h (renamed from src/gui/guiutil/qvalidator.h) | 0 | ||||
-rw-r--r-- | src/gui/util/util.pri | 10 |
82 files changed, 100 insertions, 101 deletions
diff --git a/src/gui/gui.pro b/src/gui/gui.pro index f9ae32b6b5..c4a73f4e13 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 8e41b55049..0000000000 --- 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 95ec2cfc0f..0000000000 --- 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 0000000000..6fda4fd62f --- /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 index 83d1c9183a..83d1c9183a 100644 --- a/src/gui/guikernel/qclipboard.cpp +++ b/src/gui/kernel/qclipboard.cpp diff --git a/src/gui/guikernel/qclipboard.h b/src/gui/kernel/qclipboard.h index 989ba19c2c..989ba19c2c 100644 --- a/src/gui/guikernel/qclipboard.h +++ b/src/gui/kernel/qclipboard.h diff --git a/src/gui/guikernel/qclipboard_p.h b/src/gui/kernel/qclipboard_p.h index c82694cfb8..c82694cfb8 100644 --- a/src/gui/guikernel/qclipboard_p.h +++ b/src/gui/kernel/qclipboard_p.h diff --git a/src/gui/guikernel/qclipboard_qpa.cpp b/src/gui/kernel/qclipboard_qpa.cpp index 6aa7c1d6d9..6aa7c1d6d9 100644 --- a/src/gui/guikernel/qclipboard_qpa.cpp +++ b/src/gui/kernel/qclipboard_qpa.cpp diff --git a/src/gui/guikernel/qcursor.cpp b/src/gui/kernel/qcursor.cpp index be533a365f..be533a365f 100644 --- a/src/gui/guikernel/qcursor.cpp +++ b/src/gui/kernel/qcursor.cpp diff --git a/src/gui/guikernel/qcursor.h b/src/gui/kernel/qcursor.h index b47ec04d66..b47ec04d66 100644 --- a/src/gui/guikernel/qcursor.h +++ b/src/gui/kernel/qcursor.h diff --git a/src/gui/guikernel/qcursor_p.h b/src/gui/kernel/qcursor_p.h index 660a2a5e8b..660a2a5e8b 100644 --- a/src/gui/guikernel/qcursor_p.h +++ b/src/gui/kernel/qcursor_p.h diff --git a/src/gui/guikernel/qcursor_qpa.cpp b/src/gui/kernel/qcursor_qpa.cpp index a6ae7d30f5..a6ae7d30f5 100644 --- a/src/gui/guikernel/qcursor_qpa.cpp +++ b/src/gui/kernel/qcursor_qpa.cpp diff --git a/src/gui/guikernel/qevent.cpp b/src/gui/kernel/qevent.cpp index 2b2277dfd4..2b2277dfd4 100644 --- a/src/gui/guikernel/qevent.cpp +++ b/src/gui/kernel/qevent.cpp diff --git a/src/gui/guikernel/qevent.h b/src/gui/kernel/qevent.h index 45b11d4795..45b11d4795 100644 --- a/src/gui/guikernel/qevent.h +++ b/src/gui/kernel/qevent.h diff --git a/src/gui/guikernel/qevent_p.h b/src/gui/kernel/qevent_p.h index 38060ea4ae..38060ea4ae 100644 --- a/src/gui/guikernel/qevent_p.h +++ b/src/gui/kernel/qevent_p.h diff --git a/src/gui/guikernel/qeventdispatcher_glib_qpa.cpp b/src/gui/kernel/qeventdispatcher_glib_qpa.cpp index b601e89bd7..b601e89bd7 100644 --- a/src/gui/guikernel/qeventdispatcher_glib_qpa.cpp +++ b/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 index 701f6735c4..701f6735c4 100644 --- a/src/gui/guikernel/qeventdispatcher_glib_qpa_p.h +++ b/src/gui/kernel/qeventdispatcher_glib_qpa_p.h diff --git a/src/gui/guikernel/qeventdispatcher_qpa.cpp b/src/gui/kernel/qeventdispatcher_qpa.cpp index 690209a265..690209a265 100644 --- a/src/gui/guikernel/qeventdispatcher_qpa.cpp +++ b/src/gui/kernel/qeventdispatcher_qpa.cpp diff --git a/src/gui/guikernel/qeventdispatcher_qpa_p.h b/src/gui/kernel/qeventdispatcher_qpa_p.h index d4d2be1f38..d4d2be1f38 100644 --- a/src/gui/guikernel/qeventdispatcher_qpa_p.h +++ b/src/gui/kernel/qeventdispatcher_qpa_p.h diff --git a/src/gui/guikernel/qgenericplugin_qpa.cpp b/src/gui/kernel/qgenericplugin_qpa.cpp index 43d6525bb6..43d6525bb6 100644 --- a/src/gui/guikernel/qgenericplugin_qpa.cpp +++ b/src/gui/kernel/qgenericplugin_qpa.cpp diff --git a/src/gui/guikernel/qgenericplugin_qpa.h b/src/gui/kernel/qgenericplugin_qpa.h index e1792cd417..e1792cd417 100644 --- a/src/gui/guikernel/qgenericplugin_qpa.h +++ b/src/gui/kernel/qgenericplugin_qpa.h diff --git a/src/gui/guikernel/qgenericpluginfactory_qpa.cpp b/src/gui/kernel/qgenericpluginfactory_qpa.cpp index 2f74747428..2f74747428 100644 --- a/src/gui/guikernel/qgenericpluginfactory_qpa.cpp +++ b/src/gui/kernel/qgenericpluginfactory_qpa.cpp diff --git a/src/gui/guikernel/qgenericpluginfactory_qpa.h b/src/gui/kernel/qgenericpluginfactory_qpa.h index 59eac386ed..59eac386ed 100644 --- a/src/gui/guikernel/qgenericpluginfactory_qpa.h +++ b/src/gui/kernel/qgenericpluginfactory_qpa.h diff --git a/src/gui/guikernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 86fb7f5e1d..86fb7f5e1d 100644 --- a/src/gui/guikernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp diff --git a/src/gui/guikernel/qguiapplication.h b/src/gui/kernel/qguiapplication.h index 1b2484519c..1b2484519c 100644 --- a/src/gui/guikernel/qguiapplication.h +++ b/src/gui/kernel/qguiapplication.h diff --git a/src/gui/guikernel/qguiapplication_p.h b/src/gui/kernel/qguiapplication_p.h index dfe73a4c69..dfe73a4c69 100644 --- a/src/gui/guikernel/qguiapplication_p.h +++ b/src/gui/kernel/qguiapplication_p.h diff --git a/src/gui/guikernel/qguivariant.cpp b/src/gui/kernel/qguivariant.cpp index c1e07e55a5..c1e07e55a5 100644 --- a/src/gui/guikernel/qguivariant.cpp +++ b/src/gui/kernel/qguivariant.cpp diff --git a/src/gui/guikernel/qkeymapper.cpp b/src/gui/kernel/qkeymapper.cpp index 02e0231ecd..02e0231ecd 100644 --- a/src/gui/guikernel/qkeymapper.cpp +++ b/src/gui/kernel/qkeymapper.cpp diff --git a/src/gui/guikernel/qkeymapper_p.h b/src/gui/kernel/qkeymapper_p.h index 03ba092dec..03ba092dec 100644 --- a/src/gui/guikernel/qkeymapper_p.h +++ b/src/gui/kernel/qkeymapper_p.h diff --git a/src/gui/guikernel/qkeymapper_qpa.cpp b/src/gui/kernel/qkeymapper_qpa.cpp index 7e4114057f..7e4114057f 100644 --- a/src/gui/guikernel/qkeymapper_qpa.cpp +++ b/src/gui/kernel/qkeymapper_qpa.cpp diff --git a/src/gui/guikernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp index 71661438e1..71661438e1 100644 --- a/src/gui/guikernel/qkeysequence.cpp +++ b/src/gui/kernel/qkeysequence.cpp diff --git a/src/gui/guikernel/qkeysequence.h b/src/gui/kernel/qkeysequence.h index c61501036a..c61501036a 100644 --- a/src/gui/guikernel/qkeysequence.h +++ b/src/gui/kernel/qkeysequence.h diff --git a/src/gui/guikernel/qkeysequence_p.h b/src/gui/kernel/qkeysequence_p.h index c1e5977663..c1e5977663 100644 --- a/src/gui/guikernel/qkeysequence_p.h +++ b/src/gui/kernel/qkeysequence_p.h diff --git a/src/gui/guikernel/qmime.cpp b/src/gui/kernel/qmime.cpp index 4e15ddf624..4e15ddf624 100644 --- a/src/gui/guikernel/qmime.cpp +++ b/src/gui/kernel/qmime.cpp diff --git a/src/gui/guikernel/qmime.h b/src/gui/kernel/qmime.h index a791f68cf0..a791f68cf0 100644 --- a/src/gui/guikernel/qmime.h +++ b/src/gui/kernel/qmime.h diff --git a/src/gui/guikernel/qpalette.cpp b/src/gui/kernel/qpalette.cpp index 33b1c2a2a8..33b1c2a2a8 100644 --- a/src/gui/guikernel/qpalette.cpp +++ b/src/gui/kernel/qpalette.cpp diff --git a/src/gui/guikernel/qpalette.h b/src/gui/kernel/qpalette.h index 17f3d0f653..17f3d0f653 100644 --- a/src/gui/guikernel/qpalette.h +++ b/src/gui/kernel/qpalette.h diff --git a/src/gui/guikernel/qplatformclipboard_qpa.cpp b/src/gui/kernel/qplatformclipboard_qpa.cpp index 2da3892b2d..2da3892b2d 100644 --- a/src/gui/guikernel/qplatformclipboard_qpa.cpp +++ b/src/gui/kernel/qplatformclipboard_qpa.cpp diff --git a/src/gui/guikernel/qplatformclipboard_qpa.h b/src/gui/kernel/qplatformclipboard_qpa.h index e1be8aa22f..e1be8aa22f 100644 --- a/src/gui/guikernel/qplatformclipboard_qpa.h +++ b/src/gui/kernel/qplatformclipboard_qpa.h diff --git a/src/gui/guikernel/qplatformcursor_qpa.cpp b/src/gui/kernel/qplatformcursor_qpa.cpp index f43eca640f..f43eca640f 100644 --- a/src/gui/guikernel/qplatformcursor_qpa.cpp +++ b/src/gui/kernel/qplatformcursor_qpa.cpp diff --git a/src/gui/guikernel/qplatformcursor_qpa.h b/src/gui/kernel/qplatformcursor_qpa.h index 48e13bb954..48e13bb954 100644 --- a/src/gui/guikernel/qplatformcursor_qpa.h +++ b/src/gui/kernel/qplatformcursor_qpa.h diff --git a/src/gui/guikernel/qplatformeventloopintegration_qpa.cpp b/src/gui/kernel/qplatformeventloopintegration_qpa.cpp index 0ed43eb4b5..0ed43eb4b5 100644 --- a/src/gui/guikernel/qplatformeventloopintegration_qpa.cpp +++ b/src/gui/kernel/qplatformeventloopintegration_qpa.cpp diff --git a/src/gui/guikernel/qplatformeventloopintegration_qpa.h b/src/gui/kernel/qplatformeventloopintegration_qpa.h index 87df7aefe4..87df7aefe4 100644 --- a/src/gui/guikernel/qplatformeventloopintegration_qpa.h +++ b/src/gui/kernel/qplatformeventloopintegration_qpa.h diff --git a/src/gui/guikernel/qplatformglcontext_qpa.cpp b/src/gui/kernel/qplatformglcontext_qpa.cpp index 2177a01d9b..2177a01d9b 100644 --- a/src/gui/guikernel/qplatformglcontext_qpa.cpp +++ b/src/gui/kernel/qplatformglcontext_qpa.cpp diff --git a/src/gui/guikernel/qplatformglcontext_qpa.h b/src/gui/kernel/qplatformglcontext_qpa.h index fbd43b2b48..fbd43b2b48 100644 --- a/src/gui/guikernel/qplatformglcontext_qpa.h +++ b/src/gui/kernel/qplatformglcontext_qpa.h diff --git a/src/gui/guikernel/qplatformintegration_qpa.cpp b/src/gui/kernel/qplatformintegration_qpa.cpp index 9967a444c2..9967a444c2 100644 --- a/src/gui/guikernel/qplatformintegration_qpa.cpp +++ b/src/gui/kernel/qplatformintegration_qpa.cpp diff --git a/src/gui/guikernel/qplatformintegration_qpa.h b/src/gui/kernel/qplatformintegration_qpa.h index eb29a4bd0d..eb29a4bd0d 100644 --- a/src/gui/guikernel/qplatformintegration_qpa.h +++ b/src/gui/kernel/qplatformintegration_qpa.h diff --git a/src/gui/guikernel/qplatformintegrationfactory_qpa.cpp b/src/gui/kernel/qplatformintegrationfactory_qpa.cpp index e679800ef4..e679800ef4 100644 --- a/src/gui/guikernel/qplatformintegrationfactory_qpa.cpp +++ b/src/gui/kernel/qplatformintegrationfactory_qpa.cpp diff --git a/src/gui/guikernel/qplatformintegrationfactory_qpa_p.h b/src/gui/kernel/qplatformintegrationfactory_qpa_p.h index a6042a81e0..a6042a81e0 100644 --- a/src/gui/guikernel/qplatformintegrationfactory_qpa_p.h +++ b/src/gui/kernel/qplatformintegrationfactory_qpa_p.h diff --git a/src/gui/guikernel/qplatformintegrationplugin_qpa.cpp b/src/gui/kernel/qplatformintegrationplugin_qpa.cpp index 62920b6992..62920b6992 100644 --- a/src/gui/guikernel/qplatformintegrationplugin_qpa.cpp +++ b/src/gui/kernel/qplatformintegrationplugin_qpa.cpp diff --git a/src/gui/guikernel/qplatformintegrationplugin_qpa.h b/src/gui/kernel/qplatformintegrationplugin_qpa.h index 17bcba0e46..17bcba0e46 100644 --- a/src/gui/guikernel/qplatformintegrationplugin_qpa.h +++ b/src/gui/kernel/qplatformintegrationplugin_qpa.h diff --git a/src/gui/guikernel/qplatformnativeinterface_qpa.cpp b/src/gui/kernel/qplatformnativeinterface_qpa.cpp index f160ec2899..f160ec2899 100644 --- a/src/gui/guikernel/qplatformnativeinterface_qpa.cpp +++ b/src/gui/kernel/qplatformnativeinterface_qpa.cpp diff --git a/src/gui/guikernel/qplatformnativeinterface_qpa.h b/src/gui/kernel/qplatformnativeinterface_qpa.h index ff3eacf2e0..ff3eacf2e0 100644 --- a/src/gui/guikernel/qplatformnativeinterface_qpa.h +++ b/src/gui/kernel/qplatformnativeinterface_qpa.h diff --git a/src/gui/guikernel/qplatformscreen_qpa.cpp b/src/gui/kernel/qplatformscreen_qpa.cpp index 8759aa4a88..8759aa4a88 100644 --- a/src/gui/guikernel/qplatformscreen_qpa.cpp +++ b/src/gui/kernel/qplatformscreen_qpa.cpp diff --git a/src/gui/guikernel/qplatformscreen_qpa.h b/src/gui/kernel/qplatformscreen_qpa.h index 9492788b4f..9492788b4f 100644 --- a/src/gui/guikernel/qplatformscreen_qpa.h +++ b/src/gui/kernel/qplatformscreen_qpa.h diff --git a/src/gui/guikernel/qplatformwindow_qpa.cpp b/src/gui/kernel/qplatformwindow_qpa.cpp index 24c337cf57..24c337cf57 100644 --- a/src/gui/guikernel/qplatformwindow_qpa.cpp +++ b/src/gui/kernel/qplatformwindow_qpa.cpp diff --git a/src/gui/guikernel/qplatformwindow_qpa.h b/src/gui/kernel/qplatformwindow_qpa.h index 1730f3d85e..1730f3d85e 100644 --- a/src/gui/guikernel/qplatformwindow_qpa.h +++ b/src/gui/kernel/qplatformwindow_qpa.h diff --git a/src/gui/guikernel/qsessionmanager.h b/src/gui/kernel/qsessionmanager.h index 66ca0b8282..66ca0b8282 100644 --- a/src/gui/guikernel/qsessionmanager.h +++ b/src/gui/kernel/qsessionmanager.h diff --git a/src/gui/guikernel/qsessionmanager_qpa.cpp b/src/gui/kernel/qsessionmanager_qpa.cpp index 1b4e6a612b..1b4e6a612b 100644 --- a/src/gui/guikernel/qsessionmanager_qpa.cpp +++ b/src/gui/kernel/qsessionmanager_qpa.cpp diff --git a/src/gui/guikernel/qt_gui_pch.h b/src/gui/kernel/qt_gui_pch.h index 79450219fa..79450219fa 100644 --- a/src/gui/guikernel/qt_gui_pch.h +++ b/src/gui/kernel/qt_gui_pch.h diff --git a/src/gui/guikernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp index 7faf49395a..7faf49395a 100644 --- a/src/gui/guikernel/qwindow.cpp +++ b/src/gui/kernel/qwindow.cpp diff --git a/src/gui/guikernel/qwindow.h b/src/gui/kernel/qwindow.h index f2fde2d532..f2fde2d532 100644 --- a/src/gui/guikernel/qwindow.h +++ b/src/gui/kernel/qwindow.h diff --git a/src/gui/guikernel/qwindow_p.h b/src/gui/kernel/qwindow_p.h index 6f1038e8c4..6f1038e8c4 100644 --- a/src/gui/guikernel/qwindow_p.h +++ b/src/gui/kernel/qwindow_p.h diff --git a/src/gui/guikernel/qwindowcontext_qpa.cpp b/src/gui/kernel/qwindowcontext_qpa.cpp index f121e846b2..f121e846b2 100644 --- a/src/gui/guikernel/qwindowcontext_qpa.cpp +++ b/src/gui/kernel/qwindowcontext_qpa.cpp diff --git a/src/gui/guikernel/qwindowcontext_qpa.h b/src/gui/kernel/qwindowcontext_qpa.h index c16666a7f4..c16666a7f4 100644 --- a/src/gui/guikernel/qwindowcontext_qpa.h +++ b/src/gui/kernel/qwindowcontext_qpa.h diff --git a/src/gui/guikernel/qwindowdefs.h b/src/gui/kernel/qwindowdefs.h index b9fea38da8..b9fea38da8 100644 --- a/src/gui/guikernel/qwindowdefs.h +++ b/src/gui/kernel/qwindowdefs.h diff --git a/src/gui/guikernel/qwindowformat_qpa.cpp b/src/gui/kernel/qwindowformat_qpa.cpp index 03ccba7b07..03ccba7b07 100644 --- a/src/gui/guikernel/qwindowformat_qpa.cpp +++ b/src/gui/kernel/qwindowformat_qpa.cpp diff --git a/src/gui/guikernel/qwindowformat_qpa.h b/src/gui/kernel/qwindowformat_qpa.h index 9bc2ccdfaa..9bc2ccdfaa 100644 --- a/src/gui/guikernel/qwindowformat_qpa.h +++ b/src/gui/kernel/qwindowformat_qpa.h diff --git a/src/gui/guikernel/qwindowsysteminterface_qpa.cpp b/src/gui/kernel/qwindowsysteminterface_qpa.cpp index aece0fec18..aece0fec18 100644 --- a/src/gui/guikernel/qwindowsysteminterface_qpa.cpp +++ b/src/gui/kernel/qwindowsysteminterface_qpa.cpp diff --git a/src/gui/guikernel/qwindowsysteminterface_qpa.h b/src/gui/kernel/qwindowsysteminterface_qpa.h index bd8139933c..bd8139933c 100644 --- a/src/gui/guikernel/qwindowsysteminterface_qpa.h +++ b/src/gui/kernel/qwindowsysteminterface_qpa.h diff --git a/src/gui/guikernel/qwindowsysteminterface_qpa_p.h b/src/gui/kernel/qwindowsysteminterface_qpa_p.h index 30adecc405..30adecc405 100644 --- a/src/gui/guikernel/qwindowsysteminterface_qpa_p.h +++ b/src/gui/kernel/qwindowsysteminterface_qpa_p.h diff --git a/src/gui/guiutil/qdesktopservices.cpp b/src/gui/util/qdesktopservices.cpp index 2c2c3308ca..2c2c3308ca 100644 --- a/src/gui/guiutil/qdesktopservices.cpp +++ b/src/gui/util/qdesktopservices.cpp diff --git a/src/gui/guiutil/qdesktopservices.h b/src/gui/util/qdesktopservices.h index 9d5657ecca..9d5657ecca 100644 --- a/src/gui/guiutil/qdesktopservices.h +++ b/src/gui/util/qdesktopservices.h diff --git a/src/gui/guiutil/qdesktopservices_mac.cpp b/src/gui/util/qdesktopservices_mac.cpp index e9868471cb..e9868471cb 100644 --- a/src/gui/guiutil/qdesktopservices_mac.cpp +++ b/src/gui/util/qdesktopservices_mac.cpp diff --git a/src/gui/guiutil/qdesktopservices_qpa.cpp b/src/gui/util/qdesktopservices_qpa.cpp index 324fa51a62..324fa51a62 100644 --- a/src/gui/guiutil/qdesktopservices_qpa.cpp +++ b/src/gui/util/qdesktopservices_qpa.cpp diff --git a/src/gui/guiutil/qdesktopservices_s60.cpp b/src/gui/util/qdesktopservices_s60.cpp index 8caeb74fec..8caeb74fec 100644 --- a/src/gui/guiutil/qdesktopservices_s60.cpp +++ b/src/gui/util/qdesktopservices_s60.cpp diff --git a/src/gui/guiutil/qdesktopservices_win.cpp b/src/gui/util/qdesktopservices_win.cpp index 783970ba82..783970ba82 100644 --- a/src/gui/guiutil/qdesktopservices_win.cpp +++ b/src/gui/util/qdesktopservices_win.cpp diff --git a/src/gui/guiutil/qdesktopservices_x11.cpp b/src/gui/util/qdesktopservices_x11.cpp index e685bed0b9..e685bed0b9 100644 --- a/src/gui/guiutil/qdesktopservices_x11.cpp +++ b/src/gui/util/qdesktopservices_x11.cpp diff --git a/src/gui/guiutil/qhexstring_p.h b/src/gui/util/qhexstring_p.h index 3c8d562756..3c8d562756 100644 --- a/src/gui/guiutil/qhexstring_p.h +++ b/src/gui/util/qhexstring_p.h diff --git a/src/gui/guiutil/qvalidator.cpp b/src/gui/util/qvalidator.cpp index a76f7bb6e8..a76f7bb6e8 100644 --- a/src/gui/guiutil/qvalidator.cpp +++ b/src/gui/util/qvalidator.cpp diff --git a/src/gui/guiutil/qvalidator.h b/src/gui/util/qvalidator.h index 5a0162afd5..5a0162afd5 100644 --- a/src/gui/guiutil/qvalidator.h +++ b/src/gui/util/qvalidator.h diff --git a/src/gui/util/util.pri b/src/gui/util/util.pri new file mode 100644 index 0000000000..dfb221667e --- /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 |