diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2011-05-04 12:50:14 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@nokia.com> | 2011-05-04 12:50:14 +0200 |
commit | 401f078386a8b5a87a58e237de7be9a2f9a045ba (patch) | |
tree | 462d6e4b6b7ca0d79166f34524c1661471bc68eb | |
parent | 004700532ab635cf8e5240c5674b2aaeeb601b95 (diff) | |
download | qtbase-401f078386a8b5a87a58e237de7be9a2f9a045ba.tar.gz |
split kernel/ up according to the future library split
Create a guikernel/ directory that contains the files that'll go
into libQtGui. What remains in kernel/ will go into QtWidgets.
In addition to that image/, painting/ and text will end up
int QtGui.
-rw-r--r-- | src/gui/gui.pro | 9 | ||||
-rw-r--r-- | src/gui/guikernel/qclipboard.cpp (renamed from src/gui/kernel/qclipboard.cpp) | 2 | ||||
-rw-r--r-- | src/gui/guikernel/qclipboard.h (renamed from src/gui/kernel/qclipboard.h) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qclipboard_mac.cpp (renamed from src/gui/kernel/qclipboard_mac.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qclipboard_p.h (renamed from src/gui/kernel/qclipboard_p.h) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qclipboard_qpa.cpp (renamed from src/gui/kernel/qclipboard_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qclipboard_s60.cpp (renamed from src/gui/kernel/qclipboard_s60.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qclipboard_win.cpp (renamed from src/gui/kernel/qclipboard_win.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qclipboard_x11.cpp (renamed from src/gui/kernel/qclipboard_x11.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qcursor.cpp (renamed from src/gui/kernel/qcursor.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qcursor.h (renamed from src/gui/kernel/qcursor.h) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qcursor_mac.mm (renamed from src/gui/kernel/qcursor_mac.mm) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qcursor_p.h (renamed from src/gui/kernel/qcursor_p.h) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qcursor_qpa.cpp (renamed from src/gui/kernel/qcursor_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qcursor_s60.cpp (renamed from src/gui/kernel/qcursor_s60.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qcursor_win.cpp (renamed from src/gui/kernel/qcursor_win.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qcursor_x11.cpp (renamed from src/gui/kernel/qcursor_x11.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qdnd.cpp (renamed from src/gui/kernel/qdnd.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qdnd_mac.mm (renamed from src/gui/kernel/qdnd_mac.mm) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qdnd_p.h (renamed from src/gui/kernel/qdnd_p.h) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qdnd_qpa.cpp (renamed from src/gui/kernel/qdnd_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qdnd_s60.cpp (renamed from src/gui/kernel/qdnd_s60.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qdnd_win.cpp (renamed from src/gui/kernel/qdnd_win.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qdnd_x11.cpp (renamed from src/gui/kernel/qdnd_x11.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qdrag.cpp (renamed from src/gui/kernel/qdrag.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qdrag.h (renamed from src/gui/kernel/qdrag.h) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qevent.cpp (renamed from src/gui/kernel/qevent.cpp) | 2 | ||||
-rw-r--r-- | src/gui/guikernel/qevent.h (renamed from src/gui/kernel/qevent.h) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qevent_p.h (renamed from src/gui/kernel/qevent_p.h) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qeventdispatcher_glib_qpa.cpp (renamed from src/gui/kernel/qeventdispatcher_glib_qpa.cpp) | 2 | ||||
-rw-r--r-- | src/gui/guikernel/qeventdispatcher_glib_qpa_p.h (renamed from src/gui/kernel/qeventdispatcher_glib_qpa_p.h) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qeventdispatcher_mac.mm (renamed from src/gui/kernel/qeventdispatcher_mac.mm) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qeventdispatcher_mac_p.h (renamed from src/gui/kernel/qeventdispatcher_mac_p.h) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qeventdispatcher_qpa.cpp (renamed from src/gui/kernel/qeventdispatcher_qpa.cpp) | 2 | ||||
-rw-r--r-- | src/gui/guikernel/qeventdispatcher_qpa_p.h (renamed from src/gui/kernel/qeventdispatcher_qpa_p.h) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qeventdispatcher_s60.cpp (renamed from src/gui/kernel/qeventdispatcher_s60.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qeventdispatcher_s60_p.h (renamed from src/gui/kernel/qeventdispatcher_s60_p.h) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qeventdispatcher_x11.cpp (renamed from src/gui/kernel/qeventdispatcher_x11.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qeventdispatcher_x11_p.h (renamed from src/gui/kernel/qeventdispatcher_x11_p.h) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qgenericplugin_qpa.cpp (renamed from src/gui/kernel/qgenericplugin_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qgenericplugin_qpa.h (renamed from src/gui/kernel/qgenericplugin_qpa.h) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qgenericpluginfactory_qpa.cpp (renamed from src/gui/kernel/qgenericpluginfactory_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qgenericpluginfactory_qpa.h (renamed from src/gui/kernel/qgenericpluginfactory_qpa.h) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qguiapplication.cpp (renamed from src/gui/kernel/qguiapplication.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qguiapplication.h (renamed from src/gui/kernel/qguiapplication.h) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qguiapplication_p.h (renamed from src/gui/kernel/qguiapplication_p.h) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qguivariant.cpp (renamed from src/gui/kernel/qguivariant.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qhexstring_p.h (renamed from src/gui/kernel/qhexstring_p.h) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qkeymapper.cpp (renamed from src/gui/kernel/qkeymapper.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qkeymapper_mac.cpp (renamed from src/gui/kernel/qkeymapper_mac.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qkeymapper_p.h (renamed from src/gui/kernel/qkeymapper_p.h) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qkeymapper_qpa.cpp (renamed from src/gui/kernel/qkeymapper_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qkeymapper_s60.cpp (renamed from src/gui/kernel/qkeymapper_s60.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qkeymapper_win.cpp (renamed from src/gui/kernel/qkeymapper_win.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qkeymapper_x11.cpp (renamed from src/gui/kernel/qkeymapper_x11.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qkeymapper_x11_p.cpp (renamed from src/gui/kernel/qkeymapper_x11_p.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qkeysequence.cpp (renamed from src/gui/kernel/qkeysequence.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qkeysequence.h (renamed from src/gui/kernel/qkeysequence.h) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qkeysequence_p.h (renamed from src/gui/kernel/qkeysequence_p.h) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qmime.cpp (renamed from src/gui/kernel/qmime.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qmime.h (renamed from src/gui/kernel/qmime.h) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qmime_mac.cpp (renamed from src/gui/kernel/qmime_mac.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qmime_win.cpp (renamed from src/gui/kernel/qmime_win.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qmotifdnd_x11.cpp (renamed from src/gui/kernel/qmotifdnd_x11.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qole_win.cpp (renamed from src/gui/kernel/qole_win.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qplatformclipboard_qpa.cpp (renamed from src/gui/kernel/qplatformclipboard_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qplatformclipboard_qpa.h (renamed from src/gui/kernel/qplatformclipboard_qpa.h) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qplatformcursor_qpa.cpp (renamed from src/gui/kernel/qplatformcursor_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qplatformcursor_qpa.h (renamed from src/gui/kernel/qplatformcursor_qpa.h) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qplatformeventloopintegration_qpa.cpp (renamed from src/gui/kernel/qplatformeventloopintegration_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qplatformeventloopintegration_qpa.h (renamed from src/gui/kernel/qplatformeventloopintegration_qpa.h) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qplatformglcontext_qpa.cpp (renamed from src/gui/kernel/qplatformglcontext_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qplatformglcontext_qpa.h (renamed from src/gui/kernel/qplatformglcontext_qpa.h) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qplatformintegration_qpa.cpp (renamed from src/gui/kernel/qplatformintegration_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qplatformintegration_qpa.h (renamed from src/gui/kernel/qplatformintegration_qpa.h) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qplatformintegrationfactory_qpa.cpp (renamed from src/gui/kernel/qplatformintegrationfactory_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qplatformintegrationfactory_qpa_p.h (renamed from src/gui/kernel/qplatformintegrationfactory_qpa_p.h) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qplatformintegrationplugin_qpa.cpp (renamed from src/gui/kernel/qplatformintegrationplugin_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qplatformintegrationplugin_qpa.h (renamed from src/gui/kernel/qplatformintegrationplugin_qpa.h) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qplatformnativeinterface_qpa.cpp (renamed from src/gui/kernel/qplatformnativeinterface_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qplatformnativeinterface_qpa.h (renamed from src/gui/kernel/qplatformnativeinterface_qpa.h) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qplatformscreen_qpa.cpp (renamed from src/gui/kernel/qplatformscreen_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qplatformscreen_qpa.h (renamed from src/gui/kernel/qplatformscreen_qpa.h) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qplatformwindow_qpa.cpp (renamed from src/gui/kernel/qplatformwindow_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qplatformwindow_qpa.h (renamed from src/gui/kernel/qplatformwindow_qpa.h) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qsessionmanager.h (renamed from src/gui/kernel/qsessionmanager.h) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qsessionmanager_qpa.cpp (renamed from src/gui/kernel/qsessionmanager_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qshortcut.cpp (renamed from src/gui/kernel/qshortcut.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qshortcut.h (renamed from src/gui/kernel/qshortcut.h) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qshortcutmap.cpp (renamed from src/gui/kernel/qshortcutmap.cpp) | 4 | ||||
-rw-r--r-- | src/gui/guikernel/qshortcutmap_p.h (renamed from src/gui/kernel/qshortcutmap_p.h) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qwindow.cpp (renamed from src/gui/kernel/qwindow.cpp) | 2 | ||||
-rw-r--r-- | src/gui/guikernel/qwindow.h (renamed from src/gui/kernel/qwindow.h) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qwindow_p.h (renamed from src/gui/kernel/qwindow_p.h) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qwindowcontext_qpa.cpp (renamed from src/gui/kernel/qwindowcontext_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qwindowcontext_qpa.h (renamed from src/gui/kernel/qwindowcontext_qpa.h) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qwindowdefs.h (renamed from src/gui/kernel/qwindowdefs.h) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qwindowdefs_win.h (renamed from src/gui/kernel/qwindowdefs_win.h) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qwindowformat_qpa.cpp (renamed from src/gui/kernel/qwindowformat_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qwindowformat_qpa.h (renamed from src/gui/kernel/qwindowformat_qpa.h) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qwindowsysteminterface_qpa.cpp (renamed from src/gui/kernel/qwindowsysteminterface_qpa.cpp) | 2 | ||||
-rw-r--r-- | src/gui/guikernel/qwindowsysteminterface_qpa.h (renamed from src/gui/kernel/qwindowsysteminterface_qpa.h) | 0 | ||||
-rw-r--r-- | src/gui/guikernel/qwindowsysteminterface_qpa_p.h (renamed from src/gui/kernel/qwindowsysteminterface_qpa_p.h) | 0 | ||||
-rw-r--r-- | src/gui/kernel/kernel.pri | 88 | ||||
-rw-r--r-- | src/gui/kernel/qapplication.cpp | 6 | ||||
-rw-r--r-- | src/gui/kernel/qapplication_p.h | 2 | ||||
-rw-r--r-- | src/gui/kernel/qapplication_qpa.cpp | 8 | ||||
-rw-r--r-- | src/gui/kernel/qbackingstore.cpp (renamed from src/gui/painting/qbackingstore.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qbackingstore_p.h (renamed from src/gui/painting/qbackingstore_p.h) | 0 | ||||
-rw-r--r-- | src/gui/painting/painting.pri | 5 |
110 files changed, 28 insertions, 106 deletions
diff --git a/src/gui/gui.pro b/src/gui/gui.pro index 379f2745ce..534c01ef53 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -26,12 +26,15 @@ symbian { include(s60framework/s60framework.pri) } +# stuff that goes into new QtGui +include(guikernel/guikernel.pri) +include(image/image.pri) +include(text/text.pri) +include(painting/painting.pri) + #modules include(animation/animation.pri) include(kernel/kernel.pri) -include(image/image.pri) -include(painting/painting.pri) -include(text/text.pri) include(styles/styles.pri) include(widgets/widgets.pri) include(dialogs/dialogs.pri) diff --git a/src/gui/kernel/qclipboard.cpp b/src/gui/guikernel/qclipboard.cpp index ba7ad0caac..5ff47bd136 100644 --- a/src/gui/kernel/qclipboard.cpp +++ b/src/gui/guikernel/qclipboard.cpp @@ -44,7 +44,7 @@ #ifndef QT_NO_CLIPBOARD #include "qapplication.h" -#include "qapplication_p.h" +#include "private/qapplication_p.h" #include "qpixmap.h" #include "qclipboard_p.h" #include "qvariant.h" diff --git a/src/gui/kernel/qclipboard.h b/src/gui/guikernel/qclipboard.h index 0a9e28ac8c..0a9e28ac8c 100644 --- a/src/gui/kernel/qclipboard.h +++ b/src/gui/guikernel/qclipboard.h diff --git a/src/gui/kernel/qclipboard_mac.cpp b/src/gui/guikernel/qclipboard_mac.cpp index 4a8bc56e41..4a8bc56e41 100644 --- a/src/gui/kernel/qclipboard_mac.cpp +++ b/src/gui/guikernel/qclipboard_mac.cpp diff --git a/src/gui/kernel/qclipboard_p.h b/src/gui/guikernel/qclipboard_p.h index c82694cfb8..c82694cfb8 100644 --- a/src/gui/kernel/qclipboard_p.h +++ b/src/gui/guikernel/qclipboard_p.h diff --git a/src/gui/kernel/qclipboard_qpa.cpp b/src/gui/guikernel/qclipboard_qpa.cpp index 89c0afa22d..89c0afa22d 100644 --- a/src/gui/kernel/qclipboard_qpa.cpp +++ b/src/gui/guikernel/qclipboard_qpa.cpp diff --git a/src/gui/kernel/qclipboard_s60.cpp b/src/gui/guikernel/qclipboard_s60.cpp index 0dafae0996..0dafae0996 100644 --- a/src/gui/kernel/qclipboard_s60.cpp +++ b/src/gui/guikernel/qclipboard_s60.cpp diff --git a/src/gui/kernel/qclipboard_win.cpp b/src/gui/guikernel/qclipboard_win.cpp index ea41165b9c..ea41165b9c 100644 --- a/src/gui/kernel/qclipboard_win.cpp +++ b/src/gui/guikernel/qclipboard_win.cpp diff --git a/src/gui/kernel/qclipboard_x11.cpp b/src/gui/guikernel/qclipboard_x11.cpp index d566c86e04..d566c86e04 100644 --- a/src/gui/kernel/qclipboard_x11.cpp +++ b/src/gui/guikernel/qclipboard_x11.cpp diff --git a/src/gui/kernel/qcursor.cpp b/src/gui/guikernel/qcursor.cpp index 823f6f1e8c..823f6f1e8c 100644 --- a/src/gui/kernel/qcursor.cpp +++ b/src/gui/guikernel/qcursor.cpp diff --git a/src/gui/kernel/qcursor.h b/src/gui/guikernel/qcursor.h index b47ec04d66..b47ec04d66 100644 --- a/src/gui/kernel/qcursor.h +++ b/src/gui/guikernel/qcursor.h diff --git a/src/gui/kernel/qcursor_mac.mm b/src/gui/guikernel/qcursor_mac.mm index 0afa3ee4f0..0afa3ee4f0 100644 --- a/src/gui/kernel/qcursor_mac.mm +++ b/src/gui/guikernel/qcursor_mac.mm diff --git a/src/gui/kernel/qcursor_p.h b/src/gui/guikernel/qcursor_p.h index 660a2a5e8b..660a2a5e8b 100644 --- a/src/gui/kernel/qcursor_p.h +++ b/src/gui/guikernel/qcursor_p.h diff --git a/src/gui/kernel/qcursor_qpa.cpp b/src/gui/guikernel/qcursor_qpa.cpp index a6ae7d30f5..a6ae7d30f5 100644 --- a/src/gui/kernel/qcursor_qpa.cpp +++ b/src/gui/guikernel/qcursor_qpa.cpp diff --git a/src/gui/kernel/qcursor_s60.cpp b/src/gui/guikernel/qcursor_s60.cpp index 8dfe87ef81..8dfe87ef81 100644 --- a/src/gui/kernel/qcursor_s60.cpp +++ b/src/gui/guikernel/qcursor_s60.cpp diff --git a/src/gui/kernel/qcursor_win.cpp b/src/gui/guikernel/qcursor_win.cpp index 8a9362ebfc..8a9362ebfc 100644 --- a/src/gui/kernel/qcursor_win.cpp +++ b/src/gui/guikernel/qcursor_win.cpp diff --git a/src/gui/kernel/qcursor_x11.cpp b/src/gui/guikernel/qcursor_x11.cpp index d0ed98e1fe..d0ed98e1fe 100644 --- a/src/gui/kernel/qcursor_x11.cpp +++ b/src/gui/guikernel/qcursor_x11.cpp diff --git a/src/gui/kernel/qdnd.cpp b/src/gui/guikernel/qdnd.cpp index 7063828610..7063828610 100644 --- a/src/gui/kernel/qdnd.cpp +++ b/src/gui/guikernel/qdnd.cpp diff --git a/src/gui/kernel/qdnd_mac.mm b/src/gui/guikernel/qdnd_mac.mm index 3af2ba007c..3af2ba007c 100644 --- a/src/gui/kernel/qdnd_mac.mm +++ b/src/gui/guikernel/qdnd_mac.mm diff --git a/src/gui/kernel/qdnd_p.h b/src/gui/guikernel/qdnd_p.h index 754366637c..754366637c 100644 --- a/src/gui/kernel/qdnd_p.h +++ b/src/gui/guikernel/qdnd_p.h diff --git a/src/gui/kernel/qdnd_qpa.cpp b/src/gui/guikernel/qdnd_qpa.cpp index b744c2f085..b744c2f085 100644 --- a/src/gui/kernel/qdnd_qpa.cpp +++ b/src/gui/guikernel/qdnd_qpa.cpp diff --git a/src/gui/kernel/qdnd_s60.cpp b/src/gui/guikernel/qdnd_s60.cpp index a9847a98f8..a9847a98f8 100644 --- a/src/gui/kernel/qdnd_s60.cpp +++ b/src/gui/guikernel/qdnd_s60.cpp diff --git a/src/gui/kernel/qdnd_win.cpp b/src/gui/guikernel/qdnd_win.cpp index 176e3cef7f..176e3cef7f 100644 --- a/src/gui/kernel/qdnd_win.cpp +++ b/src/gui/guikernel/qdnd_win.cpp diff --git a/src/gui/kernel/qdnd_x11.cpp b/src/gui/guikernel/qdnd_x11.cpp index 9ff1543e51..9ff1543e51 100644 --- a/src/gui/kernel/qdnd_x11.cpp +++ b/src/gui/guikernel/qdnd_x11.cpp diff --git a/src/gui/kernel/qdrag.cpp b/src/gui/guikernel/qdrag.cpp index d8d14cb45c..d8d14cb45c 100644 --- a/src/gui/kernel/qdrag.cpp +++ b/src/gui/guikernel/qdrag.cpp diff --git a/src/gui/kernel/qdrag.h b/src/gui/guikernel/qdrag.h index da847898b2..da847898b2 100644 --- a/src/gui/kernel/qdrag.h +++ b/src/gui/guikernel/qdrag.h diff --git a/src/gui/kernel/qevent.cpp b/src/gui/guikernel/qevent.cpp index 5f0cfd7d69..b78a2632aa 100644 --- a/src/gui/kernel/qevent.cpp +++ b/src/gui/guikernel/qevent.cpp @@ -52,7 +52,7 @@ #include "qdnd_p.h" #include "qevent_p.h" #include "qgesture.h" -#include "qgesture_p.h" +#include "private/qgesture_p.h" #ifdef Q_OS_SYMBIAN #include "private/qcore_symbian_p.h" diff --git a/src/gui/kernel/qevent.h b/src/gui/guikernel/qevent.h index 6128db4a64..6128db4a64 100644 --- a/src/gui/kernel/qevent.h +++ b/src/gui/guikernel/qevent.h diff --git a/src/gui/kernel/qevent_p.h b/src/gui/guikernel/qevent_p.h index b79f372d8d..b79f372d8d 100644 --- a/src/gui/kernel/qevent_p.h +++ b/src/gui/guikernel/qevent_p.h diff --git a/src/gui/kernel/qeventdispatcher_glib_qpa.cpp b/src/gui/guikernel/qeventdispatcher_glib_qpa.cpp index c63e94e8c8..c63314c889 100644 --- a/src/gui/kernel/qeventdispatcher_glib_qpa.cpp +++ b/src/gui/guikernel/qeventdispatcher_glib_qpa.cpp @@ -47,7 +47,7 @@ #include "qapplication.h" #include <glib.h> -#include "qapplication_p.h" +#include "private/qapplication_p.h" #include <qdebug.h> diff --git a/src/gui/kernel/qeventdispatcher_glib_qpa_p.h b/src/gui/guikernel/qeventdispatcher_glib_qpa_p.h index 701f6735c4..701f6735c4 100644 --- a/src/gui/kernel/qeventdispatcher_glib_qpa_p.h +++ b/src/gui/guikernel/qeventdispatcher_glib_qpa_p.h diff --git a/src/gui/kernel/qeventdispatcher_mac.mm b/src/gui/guikernel/qeventdispatcher_mac.mm index 677a7368b4..677a7368b4 100644 --- a/src/gui/kernel/qeventdispatcher_mac.mm +++ b/src/gui/guikernel/qeventdispatcher_mac.mm diff --git a/src/gui/kernel/qeventdispatcher_mac_p.h b/src/gui/guikernel/qeventdispatcher_mac_p.h index 12fcafbb01..12fcafbb01 100644 --- a/src/gui/kernel/qeventdispatcher_mac_p.h +++ b/src/gui/guikernel/qeventdispatcher_mac_p.h diff --git a/src/gui/kernel/qeventdispatcher_qpa.cpp b/src/gui/guikernel/qeventdispatcher_qpa.cpp index 26c8745954..6271804740 100644 --- a/src/gui/kernel/qeventdispatcher_qpa.cpp +++ b/src/gui/guikernel/qeventdispatcher_qpa.cpp @@ -43,7 +43,7 @@ #include "qapplication.h" #include "qeventdispatcher_qpa_p.h" #include "private/qeventdispatcher_unix_p.h" -#include "qapplication_p.h" +#include "private/qapplication_p.h" #include "qplatformeventloopintegration_qpa.h" #include <QWindowSystemInterface> diff --git a/src/gui/kernel/qeventdispatcher_qpa_p.h b/src/gui/guikernel/qeventdispatcher_qpa_p.h index d4d2be1f38..d4d2be1f38 100644 --- a/src/gui/kernel/qeventdispatcher_qpa_p.h +++ b/src/gui/guikernel/qeventdispatcher_qpa_p.h diff --git a/src/gui/kernel/qeventdispatcher_s60.cpp b/src/gui/guikernel/qeventdispatcher_s60.cpp index 2d92c89c07..2d92c89c07 100644 --- a/src/gui/kernel/qeventdispatcher_s60.cpp +++ b/src/gui/guikernel/qeventdispatcher_s60.cpp diff --git a/src/gui/kernel/qeventdispatcher_s60_p.h b/src/gui/guikernel/qeventdispatcher_s60_p.h index 7c5a8d03d4..7c5a8d03d4 100644 --- a/src/gui/kernel/qeventdispatcher_s60_p.h +++ b/src/gui/guikernel/qeventdispatcher_s60_p.h diff --git a/src/gui/kernel/qeventdispatcher_x11.cpp b/src/gui/guikernel/qeventdispatcher_x11.cpp index 110786a378..110786a378 100644 --- a/src/gui/kernel/qeventdispatcher_x11.cpp +++ b/src/gui/guikernel/qeventdispatcher_x11.cpp diff --git a/src/gui/kernel/qeventdispatcher_x11_p.h b/src/gui/guikernel/qeventdispatcher_x11_p.h index cfdd2a5fa6..cfdd2a5fa6 100644 --- a/src/gui/kernel/qeventdispatcher_x11_p.h +++ b/src/gui/guikernel/qeventdispatcher_x11_p.h diff --git a/src/gui/kernel/qgenericplugin_qpa.cpp b/src/gui/guikernel/qgenericplugin_qpa.cpp index 43d6525bb6..43d6525bb6 100644 --- a/src/gui/kernel/qgenericplugin_qpa.cpp +++ b/src/gui/guikernel/qgenericplugin_qpa.cpp diff --git a/src/gui/kernel/qgenericplugin_qpa.h b/src/gui/guikernel/qgenericplugin_qpa.h index e1792cd417..e1792cd417 100644 --- a/src/gui/kernel/qgenericplugin_qpa.h +++ b/src/gui/guikernel/qgenericplugin_qpa.h diff --git a/src/gui/kernel/qgenericpluginfactory_qpa.cpp b/src/gui/guikernel/qgenericpluginfactory_qpa.cpp index abc575ae86..abc575ae86 100644 --- a/src/gui/kernel/qgenericpluginfactory_qpa.cpp +++ b/src/gui/guikernel/qgenericpluginfactory_qpa.cpp diff --git a/src/gui/kernel/qgenericpluginfactory_qpa.h b/src/gui/guikernel/qgenericpluginfactory_qpa.h index 59eac386ed..59eac386ed 100644 --- a/src/gui/kernel/qgenericpluginfactory_qpa.h +++ b/src/gui/guikernel/qgenericpluginfactory_qpa.h diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/guikernel/qguiapplication.cpp index 52303b929f..52303b929f 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/guikernel/qguiapplication.cpp diff --git a/src/gui/kernel/qguiapplication.h b/src/gui/guikernel/qguiapplication.h index 16f56d0a51..16f56d0a51 100644 --- a/src/gui/kernel/qguiapplication.h +++ b/src/gui/guikernel/qguiapplication.h diff --git a/src/gui/kernel/qguiapplication_p.h b/src/gui/guikernel/qguiapplication_p.h index 2cc2e54f6c..2cc2e54f6c 100644 --- a/src/gui/kernel/qguiapplication_p.h +++ b/src/gui/guikernel/qguiapplication_p.h diff --git a/src/gui/kernel/qguivariant.cpp b/src/gui/guikernel/qguivariant.cpp index ef0cfc987c..ef0cfc987c 100644 --- a/src/gui/kernel/qguivariant.cpp +++ b/src/gui/guikernel/qguivariant.cpp diff --git a/src/gui/kernel/qhexstring_p.h b/src/gui/guikernel/qhexstring_p.h index 3c8d562756..3c8d562756 100644 --- a/src/gui/kernel/qhexstring_p.h +++ b/src/gui/guikernel/qhexstring_p.h diff --git a/src/gui/kernel/qkeymapper.cpp b/src/gui/guikernel/qkeymapper.cpp index e6ba3ce142..e6ba3ce142 100644 --- a/src/gui/kernel/qkeymapper.cpp +++ b/src/gui/guikernel/qkeymapper.cpp diff --git a/src/gui/kernel/qkeymapper_mac.cpp b/src/gui/guikernel/qkeymapper_mac.cpp index d3bbf89711..d3bbf89711 100644 --- a/src/gui/kernel/qkeymapper_mac.cpp +++ b/src/gui/guikernel/qkeymapper_mac.cpp diff --git a/src/gui/kernel/qkeymapper_p.h b/src/gui/guikernel/qkeymapper_p.h index ec2d8492fe..ec2d8492fe 100644 --- a/src/gui/kernel/qkeymapper_p.h +++ b/src/gui/guikernel/qkeymapper_p.h diff --git a/src/gui/kernel/qkeymapper_qpa.cpp b/src/gui/guikernel/qkeymapper_qpa.cpp index 7e4114057f..7e4114057f 100644 --- a/src/gui/kernel/qkeymapper_qpa.cpp +++ b/src/gui/guikernel/qkeymapper_qpa.cpp diff --git a/src/gui/kernel/qkeymapper_s60.cpp b/src/gui/guikernel/qkeymapper_s60.cpp index 08cfae0d2d..08cfae0d2d 100644 --- a/src/gui/kernel/qkeymapper_s60.cpp +++ b/src/gui/guikernel/qkeymapper_s60.cpp diff --git a/src/gui/kernel/qkeymapper_win.cpp b/src/gui/guikernel/qkeymapper_win.cpp index 92fa582617..92fa582617 100644 --- a/src/gui/kernel/qkeymapper_win.cpp +++ b/src/gui/guikernel/qkeymapper_win.cpp diff --git a/src/gui/kernel/qkeymapper_x11.cpp b/src/gui/guikernel/qkeymapper_x11.cpp index 5383bfd456..5383bfd456 100644 --- a/src/gui/kernel/qkeymapper_x11.cpp +++ b/src/gui/guikernel/qkeymapper_x11.cpp diff --git a/src/gui/kernel/qkeymapper_x11_p.cpp b/src/gui/guikernel/qkeymapper_x11_p.cpp index 2dbe1e77a4..2dbe1e77a4 100644 --- a/src/gui/kernel/qkeymapper_x11_p.cpp +++ b/src/gui/guikernel/qkeymapper_x11_p.cpp diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/guikernel/qkeysequence.cpp index 3cf5dc5275..3cf5dc5275 100644 --- a/src/gui/kernel/qkeysequence.cpp +++ b/src/gui/guikernel/qkeysequence.cpp diff --git a/src/gui/kernel/qkeysequence.h b/src/gui/guikernel/qkeysequence.h index c61501036a..c61501036a 100644 --- a/src/gui/kernel/qkeysequence.h +++ b/src/gui/guikernel/qkeysequence.h diff --git a/src/gui/kernel/qkeysequence_p.h b/src/gui/guikernel/qkeysequence_p.h index c1e5977663..c1e5977663 100644 --- a/src/gui/kernel/qkeysequence_p.h +++ b/src/gui/guikernel/qkeysequence_p.h diff --git a/src/gui/kernel/qmime.cpp b/src/gui/guikernel/qmime.cpp index 4e15ddf624..4e15ddf624 100644 --- a/src/gui/kernel/qmime.cpp +++ b/src/gui/guikernel/qmime.cpp diff --git a/src/gui/kernel/qmime.h b/src/gui/guikernel/qmime.h index a791f68cf0..a791f68cf0 100644 --- a/src/gui/kernel/qmime.h +++ b/src/gui/guikernel/qmime.h diff --git a/src/gui/kernel/qmime_mac.cpp b/src/gui/guikernel/qmime_mac.cpp index d6f6222c23..d6f6222c23 100644 --- a/src/gui/kernel/qmime_mac.cpp +++ b/src/gui/guikernel/qmime_mac.cpp diff --git a/src/gui/kernel/qmime_win.cpp b/src/gui/guikernel/qmime_win.cpp index feb8b78eca..feb8b78eca 100644 --- a/src/gui/kernel/qmime_win.cpp +++ b/src/gui/guikernel/qmime_win.cpp diff --git a/src/gui/kernel/qmotifdnd_x11.cpp b/src/gui/guikernel/qmotifdnd_x11.cpp index eef4cc470b..eef4cc470b 100644 --- a/src/gui/kernel/qmotifdnd_x11.cpp +++ b/src/gui/guikernel/qmotifdnd_x11.cpp diff --git a/src/gui/kernel/qole_win.cpp b/src/gui/guikernel/qole_win.cpp index 24e2d5b292..24e2d5b292 100644 --- a/src/gui/kernel/qole_win.cpp +++ b/src/gui/guikernel/qole_win.cpp diff --git a/src/gui/kernel/qplatformclipboard_qpa.cpp b/src/gui/guikernel/qplatformclipboard_qpa.cpp index 957a4dfd2e..957a4dfd2e 100644 --- a/src/gui/kernel/qplatformclipboard_qpa.cpp +++ b/src/gui/guikernel/qplatformclipboard_qpa.cpp diff --git a/src/gui/kernel/qplatformclipboard_qpa.h b/src/gui/guikernel/qplatformclipboard_qpa.h index 3381c062b8..3381c062b8 100644 --- a/src/gui/kernel/qplatformclipboard_qpa.h +++ b/src/gui/guikernel/qplatformclipboard_qpa.h diff --git a/src/gui/kernel/qplatformcursor_qpa.cpp b/src/gui/guikernel/qplatformcursor_qpa.cpp index 2ea8332ecc..2ea8332ecc 100644 --- a/src/gui/kernel/qplatformcursor_qpa.cpp +++ b/src/gui/guikernel/qplatformcursor_qpa.cpp diff --git a/src/gui/kernel/qplatformcursor_qpa.h b/src/gui/guikernel/qplatformcursor_qpa.h index 18698b6457..18698b6457 100644 --- a/src/gui/kernel/qplatformcursor_qpa.h +++ b/src/gui/guikernel/qplatformcursor_qpa.h diff --git a/src/gui/kernel/qplatformeventloopintegration_qpa.cpp b/src/gui/guikernel/qplatformeventloopintegration_qpa.cpp index 0ed43eb4b5..0ed43eb4b5 100644 --- a/src/gui/kernel/qplatformeventloopintegration_qpa.cpp +++ b/src/gui/guikernel/qplatformeventloopintegration_qpa.cpp diff --git a/src/gui/kernel/qplatformeventloopintegration_qpa.h b/src/gui/guikernel/qplatformeventloopintegration_qpa.h index 87df7aefe4..87df7aefe4 100644 --- a/src/gui/kernel/qplatformeventloopintegration_qpa.h +++ b/src/gui/guikernel/qplatformeventloopintegration_qpa.h diff --git a/src/gui/kernel/qplatformglcontext_qpa.cpp b/src/gui/guikernel/qplatformglcontext_qpa.cpp index 2177a01d9b..2177a01d9b 100644 --- a/src/gui/kernel/qplatformglcontext_qpa.cpp +++ b/src/gui/guikernel/qplatformglcontext_qpa.cpp diff --git a/src/gui/kernel/qplatformglcontext_qpa.h b/src/gui/guikernel/qplatformglcontext_qpa.h index fbd43b2b48..fbd43b2b48 100644 --- a/src/gui/kernel/qplatformglcontext_qpa.h +++ b/src/gui/guikernel/qplatformglcontext_qpa.h diff --git a/src/gui/kernel/qplatformintegration_qpa.cpp b/src/gui/guikernel/qplatformintegration_qpa.cpp index 8ff12ebf9c..8ff12ebf9c 100644 --- a/src/gui/kernel/qplatformintegration_qpa.cpp +++ b/src/gui/guikernel/qplatformintegration_qpa.cpp diff --git a/src/gui/kernel/qplatformintegration_qpa.h b/src/gui/guikernel/qplatformintegration_qpa.h index 43080d297a..43080d297a 100644 --- a/src/gui/kernel/qplatformintegration_qpa.h +++ b/src/gui/guikernel/qplatformintegration_qpa.h diff --git a/src/gui/kernel/qplatformintegrationfactory_qpa.cpp b/src/gui/guikernel/qplatformintegrationfactory_qpa.cpp index 4135c9e86a..4135c9e86a 100644 --- a/src/gui/kernel/qplatformintegrationfactory_qpa.cpp +++ b/src/gui/guikernel/qplatformintegrationfactory_qpa.cpp diff --git a/src/gui/kernel/qplatformintegrationfactory_qpa_p.h b/src/gui/guikernel/qplatformintegrationfactory_qpa_p.h index a6042a81e0..a6042a81e0 100644 --- a/src/gui/kernel/qplatformintegrationfactory_qpa_p.h +++ b/src/gui/guikernel/qplatformintegrationfactory_qpa_p.h diff --git a/src/gui/kernel/qplatformintegrationplugin_qpa.cpp b/src/gui/guikernel/qplatformintegrationplugin_qpa.cpp index 62920b6992..62920b6992 100644 --- a/src/gui/kernel/qplatformintegrationplugin_qpa.cpp +++ b/src/gui/guikernel/qplatformintegrationplugin_qpa.cpp diff --git a/src/gui/kernel/qplatformintegrationplugin_qpa.h b/src/gui/guikernel/qplatformintegrationplugin_qpa.h index 17bcba0e46..17bcba0e46 100644 --- a/src/gui/kernel/qplatformintegrationplugin_qpa.h +++ b/src/gui/guikernel/qplatformintegrationplugin_qpa.h diff --git a/src/gui/kernel/qplatformnativeinterface_qpa.cpp b/src/gui/guikernel/qplatformnativeinterface_qpa.cpp index f160ec2899..f160ec2899 100644 --- a/src/gui/kernel/qplatformnativeinterface_qpa.cpp +++ b/src/gui/guikernel/qplatformnativeinterface_qpa.cpp diff --git a/src/gui/kernel/qplatformnativeinterface_qpa.h b/src/gui/guikernel/qplatformnativeinterface_qpa.h index ff3eacf2e0..ff3eacf2e0 100644 --- a/src/gui/kernel/qplatformnativeinterface_qpa.h +++ b/src/gui/guikernel/qplatformnativeinterface_qpa.h diff --git a/src/gui/kernel/qplatformscreen_qpa.cpp b/src/gui/guikernel/qplatformscreen_qpa.cpp index 8b686781ab..8b686781ab 100644 --- a/src/gui/kernel/qplatformscreen_qpa.cpp +++ b/src/gui/guikernel/qplatformscreen_qpa.cpp diff --git a/src/gui/kernel/qplatformscreen_qpa.h b/src/gui/guikernel/qplatformscreen_qpa.h index cbaf5b9c47..cbaf5b9c47 100644 --- a/src/gui/kernel/qplatformscreen_qpa.h +++ b/src/gui/guikernel/qplatformscreen_qpa.h diff --git a/src/gui/kernel/qplatformwindow_qpa.cpp b/src/gui/guikernel/qplatformwindow_qpa.cpp index 7ec5221840..7ec5221840 100644 --- a/src/gui/kernel/qplatformwindow_qpa.cpp +++ b/src/gui/guikernel/qplatformwindow_qpa.cpp diff --git a/src/gui/kernel/qplatformwindow_qpa.h b/src/gui/guikernel/qplatformwindow_qpa.h index 1730f3d85e..1730f3d85e 100644 --- a/src/gui/kernel/qplatformwindow_qpa.h +++ b/src/gui/guikernel/qplatformwindow_qpa.h diff --git a/src/gui/kernel/qsessionmanager.h b/src/gui/guikernel/qsessionmanager.h index bd851b87e9..bd851b87e9 100644 --- a/src/gui/kernel/qsessionmanager.h +++ b/src/gui/guikernel/qsessionmanager.h diff --git a/src/gui/kernel/qsessionmanager_qpa.cpp b/src/gui/guikernel/qsessionmanager_qpa.cpp index 0730204720..0730204720 100644 --- a/src/gui/kernel/qsessionmanager_qpa.cpp +++ b/src/gui/guikernel/qsessionmanager_qpa.cpp diff --git a/src/gui/kernel/qshortcut.cpp b/src/gui/guikernel/qshortcut.cpp index 978ef0c240..978ef0c240 100644 --- a/src/gui/kernel/qshortcut.cpp +++ b/src/gui/guikernel/qshortcut.cpp diff --git a/src/gui/kernel/qshortcut.h b/src/gui/guikernel/qshortcut.h index f432d9ad97..f432d9ad97 100644 --- a/src/gui/kernel/qshortcut.h +++ b/src/gui/guikernel/qshortcut.h diff --git a/src/gui/kernel/qshortcutmap.cpp b/src/gui/guikernel/qshortcutmap.cpp index 5e65e676d9..32b70ed758 100644 --- a/src/gui/kernel/qshortcutmap.cpp +++ b/src/gui/guikernel/qshortcutmap.cpp @@ -52,7 +52,7 @@ #include "qmenu.h" #include "qmenubar.h" #include "qshortcut.h" -#include "qapplication_p.h" +#include "private/qapplication_p.h" #include <private/qaction_p.h> #include <private/qkeymapper_p.h> #include <private/qwidget_p.h> @@ -337,7 +337,7 @@ bool QShortcutMap::tryShortcutEvent(QObject *o, QKeyEvent *e) ushort orgType = e->t; e->t = QEvent::ShortcutOverride; e->ignore(); - QApplication::sendEvent(o, e); + QCoreApplication::sendEvent(o, e); e->t = orgType; e->spont = wasSpontaneous; if (e->isAccepted()) { diff --git a/src/gui/kernel/qshortcutmap_p.h b/src/gui/guikernel/qshortcutmap_p.h index bc530b00b4..bc530b00b4 100644 --- a/src/gui/kernel/qshortcutmap_p.h +++ b/src/gui/guikernel/qshortcutmap_p.h diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/guikernel/qwindow.cpp index 92b62e9276..7b57a949f0 100644 --- a/src/gui/kernel/qwindow.cpp +++ b/src/gui/guikernel/qwindow.cpp @@ -47,7 +47,7 @@ #include "qwindowcontext_qpa.h" #include "qwindow_p.h" -#include "qapplication_p.h" +#include "qguiapplication_p.h" #include <QtCore/QDebug> diff --git a/src/gui/kernel/qwindow.h b/src/gui/guikernel/qwindow.h index f2fde2d532..f2fde2d532 100644 --- a/src/gui/kernel/qwindow.h +++ b/src/gui/guikernel/qwindow.h diff --git a/src/gui/kernel/qwindow_p.h b/src/gui/guikernel/qwindow_p.h index 304ab3bc49..304ab3bc49 100644 --- a/src/gui/kernel/qwindow_p.h +++ b/src/gui/guikernel/qwindow_p.h diff --git a/src/gui/kernel/qwindowcontext_qpa.cpp b/src/gui/guikernel/qwindowcontext_qpa.cpp index f121e846b2..f121e846b2 100644 --- a/src/gui/kernel/qwindowcontext_qpa.cpp +++ b/src/gui/guikernel/qwindowcontext_qpa.cpp diff --git a/src/gui/kernel/qwindowcontext_qpa.h b/src/gui/guikernel/qwindowcontext_qpa.h index c16666a7f4..c16666a7f4 100644 --- a/src/gui/kernel/qwindowcontext_qpa.h +++ b/src/gui/guikernel/qwindowcontext_qpa.h diff --git a/src/gui/kernel/qwindowdefs.h b/src/gui/guikernel/qwindowdefs.h index dd6d13a338..dd6d13a338 100644 --- a/src/gui/kernel/qwindowdefs.h +++ b/src/gui/guikernel/qwindowdefs.h diff --git a/src/gui/kernel/qwindowdefs_win.h b/src/gui/guikernel/qwindowdefs_win.h index a4dd38410c..a4dd38410c 100644 --- a/src/gui/kernel/qwindowdefs_win.h +++ b/src/gui/guikernel/qwindowdefs_win.h diff --git a/src/gui/kernel/qwindowformat_qpa.cpp b/src/gui/guikernel/qwindowformat_qpa.cpp index 03ccba7b07..03ccba7b07 100644 --- a/src/gui/kernel/qwindowformat_qpa.cpp +++ b/src/gui/guikernel/qwindowformat_qpa.cpp diff --git a/src/gui/kernel/qwindowformat_qpa.h b/src/gui/guikernel/qwindowformat_qpa.h index 9bc2ccdfaa..9bc2ccdfaa 100644 --- a/src/gui/kernel/qwindowformat_qpa.h +++ b/src/gui/guikernel/qwindowformat_qpa.h diff --git a/src/gui/kernel/qwindowsysteminterface_qpa.cpp b/src/gui/guikernel/qwindowsysteminterface_qpa.cpp index fd143c3ab8..5fd7d76003 100644 --- a/src/gui/kernel/qwindowsysteminterface_qpa.cpp +++ b/src/gui/guikernel/qwindowsysteminterface_qpa.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qwindowsysteminterface_qpa.h" #include "qwindowsysteminterface_qpa_p.h" -#include "qapplication_p.h" +#include "private/qapplication_p.h" #include <QAbstractEventDispatcher> QT_BEGIN_NAMESPACE diff --git a/src/gui/kernel/qwindowsysteminterface_qpa.h b/src/gui/guikernel/qwindowsysteminterface_qpa.h index bd8139933c..bd8139933c 100644 --- a/src/gui/kernel/qwindowsysteminterface_qpa.h +++ b/src/gui/guikernel/qwindowsysteminterface_qpa.h diff --git a/src/gui/kernel/qwindowsysteminterface_qpa_p.h b/src/gui/guikernel/qwindowsysteminterface_qpa_p.h index 30adecc405..30adecc405 100644 --- a/src/gui/kernel/qwindowsysteminterface_qpa_p.h +++ b/src/gui/guikernel/qwindowsysteminterface_qpa_p.h diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri index 09ef146597..c2559b1225 100644 --- a/src/gui/kernel/kernel.pri +++ b/src/gui/kernel/kernel.pri @@ -11,25 +11,15 @@ HEADERS += \ kernel/qactiongroup.h \ kernel/qapplication.h \ kernel/qapplication_p.h \ + kernel/qbackingstore_p.h \ kernel/qboxlayout.h \ - kernel/qclipboard.h \ - kernel/qcursor.h \ kernel/qdesktopwidget.h \ - kernel/qdrag.h \ - kernel/qdnd_p.h \ - kernel/qevent.h \ - kernel/qevent_p.h \ kernel/qformlayout.h \ kernel/qgridlayout.h \ - kernel/qkeysequence.h \ kernel/qlayout.h \ kernel/qlayout_p.h \ kernel/qlayoutengine_p.h \ kernel/qlayoutitem.h \ - kernel/qmime.h \ - kernel/qsessionmanager.h \ - kernel/qshortcut.h \ - kernel/qshortcutmap_p.h \ kernel/qsizepolicy.h \ kernel/qpalette.h \ kernel/qstackedlayout.h \ @@ -39,8 +29,6 @@ HEADERS += \ kernel/qwidget_p.h \ kernel/qwidgetaction.h \ kernel/qwidgetaction_p.h \ - kernel/qwindowdefs.h \ - kernel/qkeymapper_p.h \ kernel/qgesture.h \ kernel/qgesture_p.h \ kernel/qstandardgestures_p.h \ @@ -48,36 +36,25 @@ HEADERS += \ kernel/qgesturemanager_p.h \ kernel/qsoftkeymanager_p.h \ kernel/qsoftkeymanager_common_p.h \ - kernel/qguiplatformplugin_p.h \ - kernel/qhexstring_p.h + kernel/qguiplatformplugin_p.h SOURCES += \ kernel/qaction.cpp \ kernel/qactiongroup.cpp \ kernel/qapplication.cpp \ - kernel/qboxlayout.cpp \ - kernel/qclipboard.cpp \ - kernel/qcursor.cpp \ - kernel/qdrag.cpp \ - kernel/qdnd.cpp \ - kernel/qevent.cpp \ + kernel/qbackingstore.cpp \ + kernel/qboxlayout.cpp \ kernel/qformlayout.cpp \ kernel/qgridlayout.cpp \ - kernel/qkeysequence.cpp \ kernel/qlayout.cpp \ kernel/qlayoutengine.cpp \ kernel/qlayoutitem.cpp \ - kernel/qmime.cpp \ kernel/qpalette.cpp \ - kernel/qshortcut.cpp \ - kernel/qshortcutmap.cpp \ kernel/qstackedlayout.cpp \ kernel/qtooltip.cpp \ - kernel/qguivariant.cpp \ kernel/qwhatsthis.cpp \ kernel/qwidget.cpp \ kernel/qwidgetaction.cpp \ - kernel/qkeymapper.cpp \ kernel/qgesture.cpp \ kernel/qstandardgestures.cpp \ kernel/qgesturerecognizer.cpp \ @@ -184,68 +161,15 @@ unix:x11 { } 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 \ + HEADERS += \ kernel/qdesktopwidget_qpa_p.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/qwidgetwindow_qpa_p.h \ - kernel/qwindow_p.h \ - kernel/qwindow.h - SOURCES += \ + SOURCES += \ kernel/qapplication_qpa.cpp \ - kernel/qclipboard_qpa.cpp \ - kernel/qcursor_qpa.cpp \ - kernel/qdnd_qpa.cpp \ kernel/qdesktopwidget_qpa.cpp \ - kernel/qgenericpluginfactory_qpa.cpp \ - kernel/qgenericplugin_qpa.cpp \ - kernel/qkeymapper_qpa.cpp \ kernel/qwidget_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/qwidgetwindow_qpa.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 - } } !qpa:!x11:mac { diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp index 08a6f540a8..d489aaf6bd 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -61,7 +61,7 @@ #include "qtranslator.h" #include "qvariant.h" #include "qwidget.h" -#include "qdnd_p.h" +#include "private/qdnd_p.h" #include "qcolormap.h" #include "qdebug.h" #include "private/qstylesheetstyle_p.h" @@ -70,7 +70,7 @@ #include <QtGui/qgraphicsproxywidget.h> #include "qinputcontext.h" -#include "qkeymapper_p.h" +#include "private/qkeymapper_p.h" #ifdef Q_WS_X11 #include <private/qt_x11_p.h> @@ -94,7 +94,7 @@ #endif #include "qapplication_p.h" -#include "qevent_p.h" +#include "private/qevent_p.h" #include "qwidget_p.h" #include "qapplication.h" diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h index acad22d4a9..41d05f5978 100644 --- a/src/gui/kernel/qapplication_p.h +++ b/src/gui/kernel/qapplication_p.h @@ -74,7 +74,7 @@ #endif #ifdef Q_WS_QPA #include <QWindowSystemInterface> -#include "qwindowsysteminterface_qpa_p.h" +#include "private/qwindowsysteminterface_qpa_p.h" #include "QtGui/qplatformintegration_qpa.h" #include "QtGui/private/qguiapplication_p.h" #endif diff --git a/src/gui/kernel/qapplication_qpa.cpp b/src/gui/kernel/qapplication_qpa.cpp index 1996bdaa13..30ae8cf3f1 100644 --- a/src/gui/kernel/qapplication_qpa.cpp +++ b/src/gui/kernel/qapplication_qpa.cpp @@ -43,9 +43,9 @@ #include "qcolormap.h" #include "qpixmapcache.h" #if !defined(QT_NO_GLIB) -#include "qeventdispatcher_glib_qpa_p.h" +#include "private/qeventdispatcher_glib_qpa_p.h" #endif -#include "qeventdispatcher_qpa_p.h" +#include "private/qeventdispatcher_qpa_p.h" #ifndef QT_NO_CURSOR #include "private/qcursor_p.h" #endif @@ -54,14 +54,14 @@ #include "private/qevent_p.h" #include "qgenericpluginfactory_qpa.h" -#include "qplatformintegrationfactory_qpa_p.h" +#include "private/qplatformintegrationfactory_qpa_p.h" #include <qdesktopwidget.h> #include <qinputcontext.h> #include <QPlatformCursor> #include <qdebug.h> #include <QWindowSystemInterface> -#include "qwindowsysteminterface_qpa_p.h" +#include "private/qwindowsysteminterface_qpa_p.h" #include <QPlatformIntegration> #include "qdesktopwidget_qpa_p.h" diff --git a/src/gui/painting/qbackingstore.cpp b/src/gui/kernel/qbackingstore.cpp index 1ee66f09cc..1ee66f09cc 100644 --- a/src/gui/painting/qbackingstore.cpp +++ b/src/gui/kernel/qbackingstore.cpp diff --git a/src/gui/painting/qbackingstore_p.h b/src/gui/kernel/qbackingstore_p.h index 05f4bfcb6c..05f4bfcb6c 100644 --- a/src/gui/painting/qbackingstore_p.h +++ b/src/gui/kernel/qbackingstore_p.h diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri index a05c99a610..c311739a72 100644 --- a/src/gui/painting/painting.pri +++ b/src/gui/painting/painting.pri @@ -140,11 +140,6 @@ unix:!mac:!symbian|qpa { painting/qprinterinfo_unix.cpp } -win32|x11|mac|qpa|symbian { - SOURCES += painting/qbackingstore.cpp - HEADERS += painting/qbackingstore_p.h -} - qpa { SOURCES += \ painting/qcolormap_qpa.cpp \ |