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.
This commit is contained in:
parent
004700532a
commit
401f078386
@ -26,12 +26,15 @@ symbian {
|
|||||||
include(s60framework/s60framework.pri)
|
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
|
#modules
|
||||||
include(animation/animation.pri)
|
include(animation/animation.pri)
|
||||||
include(kernel/kernel.pri)
|
include(kernel/kernel.pri)
|
||||||
include(image/image.pri)
|
|
||||||
include(painting/painting.pri)
|
|
||||||
include(text/text.pri)
|
|
||||||
include(styles/styles.pri)
|
include(styles/styles.pri)
|
||||||
include(widgets/widgets.pri)
|
include(widgets/widgets.pri)
|
||||||
include(dialogs/dialogs.pri)
|
include(dialogs/dialogs.pri)
|
||||||
|
@ -44,7 +44,7 @@
|
|||||||
#ifndef QT_NO_CLIPBOARD
|
#ifndef QT_NO_CLIPBOARD
|
||||||
|
|
||||||
#include "qapplication.h"
|
#include "qapplication.h"
|
||||||
#include "qapplication_p.h"
|
#include "private/qapplication_p.h"
|
||||||
#include "qpixmap.h"
|
#include "qpixmap.h"
|
||||||
#include "qclipboard_p.h"
|
#include "qclipboard_p.h"
|
||||||
#include "qvariant.h"
|
#include "qvariant.h"
|
@ -52,7 +52,7 @@
|
|||||||
#include "qdnd_p.h"
|
#include "qdnd_p.h"
|
||||||
#include "qevent_p.h"
|
#include "qevent_p.h"
|
||||||
#include "qgesture.h"
|
#include "qgesture.h"
|
||||||
#include "qgesture_p.h"
|
#include "private/qgesture_p.h"
|
||||||
|
|
||||||
#ifdef Q_OS_SYMBIAN
|
#ifdef Q_OS_SYMBIAN
|
||||||
#include "private/qcore_symbian_p.h"
|
#include "private/qcore_symbian_p.h"
|
@ -47,7 +47,7 @@
|
|||||||
#include "qapplication.h"
|
#include "qapplication.h"
|
||||||
|
|
||||||
#include <glib.h>
|
#include <glib.h>
|
||||||
#include "qapplication_p.h"
|
#include "private/qapplication_p.h"
|
||||||
|
|
||||||
#include <qdebug.h>
|
#include <qdebug.h>
|
||||||
|
|
@ -43,7 +43,7 @@
|
|||||||
#include "qapplication.h"
|
#include "qapplication.h"
|
||||||
#include "qeventdispatcher_qpa_p.h"
|
#include "qeventdispatcher_qpa_p.h"
|
||||||
#include "private/qeventdispatcher_unix_p.h"
|
#include "private/qeventdispatcher_unix_p.h"
|
||||||
#include "qapplication_p.h"
|
#include "private/qapplication_p.h"
|
||||||
#include "qplatformeventloopintegration_qpa.h"
|
#include "qplatformeventloopintegration_qpa.h"
|
||||||
|
|
||||||
#include <QWindowSystemInterface>
|
#include <QWindowSystemInterface>
|
@ -52,7 +52,7 @@
|
|||||||
#include "qmenu.h"
|
#include "qmenu.h"
|
||||||
#include "qmenubar.h"
|
#include "qmenubar.h"
|
||||||
#include "qshortcut.h"
|
#include "qshortcut.h"
|
||||||
#include "qapplication_p.h"
|
#include "private/qapplication_p.h"
|
||||||
#include <private/qaction_p.h>
|
#include <private/qaction_p.h>
|
||||||
#include <private/qkeymapper_p.h>
|
#include <private/qkeymapper_p.h>
|
||||||
#include <private/qwidget_p.h>
|
#include <private/qwidget_p.h>
|
||||||
@ -337,7 +337,7 @@ bool QShortcutMap::tryShortcutEvent(QObject *o, QKeyEvent *e)
|
|||||||
ushort orgType = e->t;
|
ushort orgType = e->t;
|
||||||
e->t = QEvent::ShortcutOverride;
|
e->t = QEvent::ShortcutOverride;
|
||||||
e->ignore();
|
e->ignore();
|
||||||
QApplication::sendEvent(o, e);
|
QCoreApplication::sendEvent(o, e);
|
||||||
e->t = orgType;
|
e->t = orgType;
|
||||||
e->spont = wasSpontaneous;
|
e->spont = wasSpontaneous;
|
||||||
if (e->isAccepted()) {
|
if (e->isAccepted()) {
|
@ -47,7 +47,7 @@
|
|||||||
#include "qwindowcontext_qpa.h"
|
#include "qwindowcontext_qpa.h"
|
||||||
|
|
||||||
#include "qwindow_p.h"
|
#include "qwindow_p.h"
|
||||||
#include "qapplication_p.h"
|
#include "qguiapplication_p.h"
|
||||||
|
|
||||||
#include <QtCore/QDebug>
|
#include <QtCore/QDebug>
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user