summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/kernel')
-rw-r--r--src/gui/kernel/kernel.pri6
-rw-r--r--src/gui/kernel/qapplication.cpp9
-rw-r--r--src/gui/kernel/qapplication_p.h4
-rw-r--r--src/gui/kernel/qapplication_qpa.cpp12
-rw-r--r--src/gui/kernel/qdesktopwidget_qpa_p.h6
-rw-r--r--src/gui/kernel/qeventdispatcher_glib_qpa.cpp16
-rw-r--r--src/gui/kernel/qeventdispatcher_glib_qpa_p.h22
-rw-r--r--src/gui/kernel/qeventdispatcher_qpa.cpp26
-rw-r--r--src/gui/kernel/qeventdispatcher_qpa_p.h16
-rw-r--r--src/gui/kernel/qgenericplugin_qpa.cpp6
-rw-r--r--src/gui/kernel/qgenericplugin_qpa.h6
-rw-r--r--src/gui/kernel/qgenericpluginfactory_qpa.cpp6
-rw-r--r--src/gui/kernel/qgenericpluginfactory_qpa.h6
-rw-r--r--src/gui/kernel/qwidget_qpa.cpp6
-rw-r--r--src/gui/kernel/qwindowsysteminterface.cpp2
15 files changed, 74 insertions, 75 deletions
diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri
index 965cbe3..f773906 100644
--- a/src/gui/kernel/kernel.pri
+++ b/src/gui/kernel/kernel.pri
@@ -48,8 +48,7 @@ HEADERS += \
kernel/qgesturemanager_p.h \
kernel/qsoftkeymanager_p.h \
kernel/qsoftkeymanager_common_p.h \
- kernel/qguiplatformplugin_p.h \
- kernel/qdesktopwidget_qpa_p.h
+ kernel/qguiplatformplugin_p.h
SOURCES += \
kernel/qaction.cpp \
@@ -215,7 +214,8 @@ qpa {
kernel/qplatformintegrationfactory_qpa_p.h \
kernel/qplatformintegrationplugin_qpa.h \
kernel/qplatformwindow_qpa.h \
- kernel/qplatformglcontext_qpa.h
+ kernel/qplatformglcontext_qpa.h \
+ kernel/qdesktopwidget_qpa_p.h
SOURCES += \
kernel/qapplication_qpa.cpp \
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index b3e6fcd..e1ed588 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -927,8 +927,7 @@ void QApplicationPrivate::initialize()
// initialize the graphics system - on X11 this is initialized inside
// qt_init() in qapplication_x11.cpp because of several reasons.
// On QWS, the graphics system is set by the QScreen plugin.
- // For lighthouse it will be initialized to QLiteGraphicsSystem
- // when the platformIntegration plugin is instansiated in qt_init(
+ // We don't use graphics systems in Qt QPA
graphics_system = QGraphicsSystemFactory::create(graphics_system_name);
#endif
@@ -2763,9 +2762,9 @@ void QApplicationPrivate::dispatchEnterLeave(QWidget* enter, QWidget* leave) {
qt_x11_enforce_cursor(parentOfLeavingCursor,true);
#elif defined(Q_WS_QPA)
if (enter == QApplication::desktop()) {
- qt_lite_set_cursor(enter, true);
+ qt_qpa_set_cursor(enter, true);
} else {
- qt_lite_set_cursor(parentOfLeavingCursor, true);
+ qt_qpa_set_cursor(parentOfLeavingCursor, true);
}
#endif
}
@@ -2792,7 +2791,7 @@ void QApplicationPrivate::dispatchEnterLeave(QWidget* enter, QWidget* leave) {
#elif defined(Q_WS_S60)
qt_symbian_set_cursor(cursorWidget, true);
#elif defined(Q_WS_QPA)
- qt_lite_set_cursor(cursorWidget, true);
+ qt_qpa_set_cursor(cursorWidget, true);
#endif
}
}
diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h
index 7d98f4d..68ec648 100644
--- a/src/gui/kernel/qapplication_p.h
+++ b/src/gui/kernel/qapplication_p.h
@@ -328,7 +328,7 @@ public:
static QPlatformIntegration *platformIntegration()
{ return platform_integration; }
- static QAbstractEventDispatcher *qt_lite_core_dispatcher()
+ static QAbstractEventDispatcher *qt_qpa_core_dispatcher()
{ return QCoreApplication::instance()->d_func()->threadData->eventDispatcher; }
#endif
@@ -661,7 +661,7 @@ Q_GUI_EXPORT void qt_translateRawTouchEvent(QWidget *window,
#elif defined(Q_OS_SYMBIAN)
extern void qt_symbian_set_cursor(QWidget *, bool);
#elif defined (Q_WS_QPA)
- extern void qt_lite_set_cursor(QWidget *, bool);
+ extern void qt_qpa_set_cursor(QWidget *, bool);
#endif
QT_END_NAMESPACE
diff --git a/src/gui/kernel/qapplication_qpa.cpp b/src/gui/kernel/qapplication_qpa.cpp
index 1fc202c..2adcfc1 100644
--- a/src/gui/kernel/qapplication_qpa.cpp
+++ b/src/gui/kernel/qapplication_qpa.cpp
@@ -123,10 +123,10 @@ void QApplicationPrivate::createEventDispatcher()
Q_Q(QApplication);
#if !defined(QT_NO_GLIB)
if (qgetenv("QT_NO_GLIB").isEmpty() && QEventDispatcherGlib::versionSupported())
- eventDispatcher = new QLiteEventDispatcherGlib(q);
+ eventDispatcher = new QPAEventDispatcherGlib(q);
else
#endif
- eventDispatcher = new QEventDispatcherLite(q);
+ eventDispatcher = new QEventDispatcherQPA(q);
}
static bool qt_try_modal(QWidget *widget, QEvent::Type type)
@@ -378,7 +378,7 @@ bool QApplication::isEffectEnabled(Qt::UIEffect effect)
void QApplication::setOverrideCursor(const QCursor &cursor)
{
qApp->d_func()->cursor_list.prepend(cursor);
- qt_lite_set_cursor(0, false);
+ qt_qpa_set_cursor(0, false);
}
void QApplication::restoreOverrideCursor()
@@ -386,7 +386,7 @@ void QApplication::restoreOverrideCursor()
if (qApp->d_func()->cursor_list.isEmpty())
return;
qApp->d_func()->cursor_list.removeFirst();
- qt_lite_set_cursor(0, false);
+ qt_qpa_set_cursor(0, false);
}
#endif// QT_NO_CURSOR
@@ -490,7 +490,7 @@ void qt_init(QApplicationPrivate *priv, int type)
}
QList<QByteArray> pluginList;
- QString platformName = qgetenv("QT_LITE_PLATFORM");
+ QString platformName = qgetenv("QT_QPA_PLATFORM");
// Get command line params
@@ -521,7 +521,7 @@ void qt_init(QApplicationPrivate *priv, int type)
}
#if 0
- QByteArray pluginEnv = qgetenv("QT_LITE_PLUGINS");
+ QByteArray pluginEnv = qgetenv("QT_QPA_PLUGINS");
if (!pluginEnv.isEmpty()) {
pluginList.append(pluginEnv.split(';'));
}
diff --git a/src/gui/kernel/qdesktopwidget_qpa_p.h b/src/gui/kernel/qdesktopwidget_qpa_p.h
index 33e4c98..8bed09d 100644
--- a/src/gui/kernel/qdesktopwidget_qpa_p.h
+++ b/src/gui/kernel/qdesktopwidget_qpa_p.h
@@ -50,8 +50,8 @@
// We mean it.
//
-#ifndef QDESKTOPWIDGET_LITE_P_H
-#define QDESKTOPWIDGET_LITE_P_H
+#ifndef QDESKTOPWIDGET_QPA_P_H
+#define QDESKTOPWIDGET_QPA_P_H
#include "QDesktopWidget"
#include "private/qwidget_p.h"
@@ -73,4 +73,4 @@ public:
QDesktopScreenWidget virtualScreen;
};
-#endif // QDESKTOPWIDGET_LITE_P_H
+#endif // QDESKTOPWIDGET_QPA_P_H
diff --git a/src/gui/kernel/qeventdispatcher_glib_qpa.cpp b/src/gui/kernel/qeventdispatcher_glib_qpa.cpp
index f45902c..9585b26 100644
--- a/src/gui/kernel/qeventdispatcher_glib_qpa.cpp
+++ b/src/gui/kernel/qeventdispatcher_glib_qpa.cpp
@@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE
struct GUserEventSource
{
GSource source;
- QLiteEventDispatcherGlib *q;
+ QPAEventDispatcherGlib *q;
};
static gboolean userEventSourcePrepare(GSource *s, gint *timeout)
@@ -104,7 +104,7 @@ static GSourceFuncs userEventSourceFuncs = {
NULL
};
-QLiteEventDispatcherGlibPrivate::QLiteEventDispatcherGlibPrivate(GMainContext *context)
+QPAEventDispatcherGlibPrivate::QPAEventDispatcherGlibPrivate(GMainContext *context)
: QEventDispatcherGlibPrivate(context)
{
userEventSource = reinterpret_cast<GUserEventSource *>(g_source_new(&userEventSourceFuncs,
@@ -115,23 +115,23 @@ QLiteEventDispatcherGlibPrivate::QLiteEventDispatcherGlibPrivate(GMainContext *c
}
-QLiteEventDispatcherGlib::QLiteEventDispatcherGlib(QObject *parent)
- : QEventDispatcherGlib(*new QLiteEventDispatcherGlibPrivate, parent)
+QPAEventDispatcherGlib::QPAEventDispatcherGlib(QObject *parent)
+ : QEventDispatcherGlib(*new QPAEventDispatcherGlibPrivate, parent)
{
- Q_D(QLiteEventDispatcherGlib);
+ Q_D(QPAEventDispatcherGlib);
d->userEventSource->q = this;
}
-QLiteEventDispatcherGlib::~QLiteEventDispatcherGlib()
+QPAEventDispatcherGlib::~QPAEventDispatcherGlib()
{
- Q_D(QLiteEventDispatcherGlib);
+ Q_D(QPAEventDispatcherGlib);
g_source_destroy(&d->userEventSource->source);
g_source_unref(&d->userEventSource->source);
d->userEventSource = 0;
}
-bool QLiteEventDispatcherGlib::processEvents(QEventLoop::ProcessEventsFlags flags)
+bool QPAEventDispatcherGlib::processEvents(QEventLoop::ProcessEventsFlags flags)
{
return QEventDispatcherGlib::processEvents(flags);
}
diff --git a/src/gui/kernel/qeventdispatcher_glib_qpa_p.h b/src/gui/kernel/qeventdispatcher_glib_qpa_p.h
index 6ebdb25..1c32ab2 100644
--- a/src/gui/kernel/qeventdispatcher_glib_qpa_p.h
+++ b/src/gui/kernel/qeventdispatcher_glib_qpa_p.h
@@ -39,8 +39,8 @@
**
****************************************************************************/
-#ifndef QLITEEVENTDISPATCHER_GLIB_P_H
-#define QLITEEVENTDISPATCHER_GLIB_P_H
+#ifndef QEVENTDISPATCHER_GLIB_QPA_P_H
+#define QEVENTDISPATCHER_GLIB_QPA_P_H
//
// W A R N I N G
@@ -58,31 +58,31 @@
typedef struct _GMainContext GMainContext;
QT_BEGIN_NAMESPACE
-class QLiteEventDispatcherGlibPrivate;
+class QPAEventDispatcherGlibPrivate;
-class QLiteEventDispatcherGlib : public QEventDispatcherGlib
+class QPAEventDispatcherGlib : public QEventDispatcherGlib
{
Q_OBJECT
- Q_DECLARE_PRIVATE(QLiteEventDispatcherGlib)
+ Q_DECLARE_PRIVATE(QPAEventDispatcherGlib)
public:
- explicit QLiteEventDispatcherGlib(QObject *parent = 0);
- ~QLiteEventDispatcherGlib();
+ explicit QPAEventDispatcherGlib(QObject *parent = 0);
+ ~QPAEventDispatcherGlib();
bool processEvents(QEventLoop::ProcessEventsFlags flags);
};
struct GUserEventSource;
-class QLiteEventDispatcherGlibPrivate : public QEventDispatcherGlibPrivate
+class QPAEventDispatcherGlibPrivate : public QEventDispatcherGlibPrivate
{
- Q_DECLARE_PUBLIC(QLiteEventDispatcherGlib)
+ Q_DECLARE_PUBLIC(QPAEventDispatcherGlib)
public:
- QLiteEventDispatcherGlibPrivate(GMainContext *context = 0);
+ QPAEventDispatcherGlibPrivate(GMainContext *context = 0);
GUserEventSource *userEventSource;
};
QT_END_NAMESPACE
-#endif // QLITEEVENTDISPATCHER_GLIB_P_H
+#endif // QEVENTDISPATCHER_GLIB_QPA_P_H
diff --git a/src/gui/kernel/qeventdispatcher_qpa.cpp b/src/gui/kernel/qeventdispatcher_qpa.cpp
index c6b5636..5740548 100644
--- a/src/gui/kernel/qeventdispatcher_qpa.cpp
+++ b/src/gui/kernel/qeventdispatcher_qpa.cpp
@@ -54,29 +54,29 @@ QT_BEGIN_NAMESPACE
QT_USE_NAMESPACE
-class QEventDispatcherLitePrivate : public QEventDispatcherUNIXPrivate
+class QEventDispatcherQPAPrivate : public QEventDispatcherUNIXPrivate
{
- Q_DECLARE_PUBLIC(QEventDispatcherLite)
+ Q_DECLARE_PUBLIC(QEventDispatcherQPA)
public:
- inline QEventDispatcherLitePrivate()
+ inline QEventDispatcherQPAPrivate()
{ }
};
-QEventDispatcherLite::QEventDispatcherLite(QObject *parent)
- : QEventDispatcherUNIX(*new QEventDispatcherLitePrivate, parent)
+QEventDispatcherQPA::QEventDispatcherQPA(QObject *parent)
+ : QEventDispatcherUNIX(*new QEventDispatcherQPAPrivate, parent)
{ }
-QEventDispatcherLite::~QEventDispatcherLite()
+QEventDispatcherQPA::~QEventDispatcherQPA()
{ }
//#define ZERO_FOR_THE_MOMENT
-bool QEventDispatcherLite::processEvents(QEventLoop::ProcessEventsFlags flags)
+bool QEventDispatcherQPA::processEvents(QEventLoop::ProcessEventsFlags flags)
{
- Q_D(QEventDispatcherLite);
+ Q_D(QEventDispatcherQPA);
int nevents = 0;
// handle gui and posted events
@@ -112,30 +112,30 @@ bool QEventDispatcherLite::processEvents(QEventLoop::ProcessEventsFlags flags)
return (nevents > 0);
}
-bool QEventDispatcherLite::hasPendingEvents()
+bool QEventDispatcherQPA::hasPendingEvents()
{
extern uint qGlobalPostedEventsCount(); // from qapplication.cpp
return qGlobalPostedEventsCount() || QWindowSystemInterfacePrivate::userEventsQueued();;
}
-void QEventDispatcherLite::startingUp()
+void QEventDispatcherQPA::startingUp()
{
}
-void QEventDispatcherLite::closingDown()
+void QEventDispatcherQPA::closingDown()
{
}
-void QEventDispatcherLite::flush()
+void QEventDispatcherQPA::flush()
{
if(qApp)
qApp->sendPostedEvents();
}
-int QEventDispatcherLite::select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
+int QEventDispatcherQPA::select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
timeval *timeout)
{
return QEventDispatcherUNIX::select(nfds, readfds, writefds, exceptfds, timeout);
diff --git a/src/gui/kernel/qeventdispatcher_qpa_p.h b/src/gui/kernel/qeventdispatcher_qpa_p.h
index c098e6c..878daaa 100644
--- a/src/gui/kernel/qeventdispatcher_qpa_p.h
+++ b/src/gui/kernel/qeventdispatcher_qpa_p.h
@@ -39,8 +39,8 @@
**
****************************************************************************/
-#ifndef QEVENTDISPATCHER_LITE_P_H
-#define QEVENTDISPATCHER_LITE_P_H
+#ifndef QEVENTDISPATCHER_QPA_P_H
+#define QEVENTDISPATCHER_QPA_P_H
//
// W A R N I N G
@@ -57,16 +57,16 @@
QT_BEGIN_NAMESPACE
-class QEventDispatcherLitePrivate;
+class QEventDispatcherQPAPrivate;
-class QEventDispatcherLite : public QEventDispatcherUNIX
+class QEventDispatcherQPA : public QEventDispatcherUNIX
{
Q_OBJECT
- Q_DECLARE_PRIVATE(QEventDispatcherLite)
+ Q_DECLARE_PRIVATE(QEventDispatcherQPA)
public:
- explicit QEventDispatcherLite(QObject *parent = 0);
- ~QEventDispatcherLite();
+ explicit QEventDispatcherQPA(QObject *parent = 0);
+ ~QEventDispatcherQPA();
bool processEvents(QEventLoop::ProcessEventsFlags flags);
bool hasPendingEvents();
@@ -83,4 +83,4 @@ protected:
QT_END_NAMESPACE
-#endif // QEVENTDISPATCHER_LITE_P_H
+#endif // QEVENTDISPATCHER_QPA_P_H
diff --git a/src/gui/kernel/qgenericplugin_qpa.cpp b/src/gui/kernel/qgenericplugin_qpa.cpp
index 6290b40..43d6525 100644
--- a/src/gui/kernel/qgenericplugin_qpa.cpp
+++ b/src/gui/kernel/qgenericplugin_qpa.cpp
@@ -48,12 +48,12 @@ QT_BEGIN_NAMESPACE
/*!
\class QGenericPlugin
\ingroup plugins
- \ingroup lite
+ \ingroup qpa
\brief The QGenericPlugin class is an abstract base class for
- window-system related plugins in Qt for Embedded Linux LITE.
+ window-system related plugins in Qt QPA.
- Note that this class is only available in \l{Qt for Embedded Linux LITE}.
+ Note that this class is only available in \l{Qt QPA}.
A mouse plugin can be created by subclassing
QGenericPlugin and reimplementing the pure virtual keys() and
diff --git a/src/gui/kernel/qgenericplugin_qpa.h b/src/gui/kernel/qgenericplugin_qpa.h
index a468a9f..e1792cd 100644
--- a/src/gui/kernel/qgenericplugin_qpa.h
+++ b/src/gui/kernel/qgenericplugin_qpa.h
@@ -39,8 +39,8 @@
**
****************************************************************************/
-#ifndef QGENERICPLUGIN_LITE_H
-#define QGENERICPLUGIN_LITE_H
+#ifndef QGENERICPLUGIN_QPA_H
+#define QGENERICPLUGIN_QPA_H
#include <QtCore/qplugin.h>
#include <QtCore/qfactoryinterface.h>
@@ -81,4 +81,4 @@ QT_END_NAMESPACE
QT_END_HEADER
-#endif // QMOUSEDRIVERPLUGIN_QWS_H
+#endif // QGENERICPLUGIN_QPA_H
diff --git a/src/gui/kernel/qgenericpluginfactory_qpa.cpp b/src/gui/kernel/qgenericpluginfactory_qpa.cpp
index dcc7cc7..abc575a 100644
--- a/src/gui/kernel/qgenericpluginfactory_qpa.cpp
+++ b/src/gui/kernel/qgenericpluginfactory_qpa.cpp
@@ -60,12 +60,12 @@ Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
/*!
\class QGenericPluginFactory
- \ingroup qws
+ \ingroup qpa
\brief The QGenericPluginFactory class creates window-system
- related plugin drivers in Qt for Embedded Linux LITE.
+ related plugin drivers in Qt QPA.
- Note that this class is only available in \l{Qt for Embedded Linux LITE}.
+ Note that this class is only available in \l{Qt QPA}.
\sa QGenericPlugin
diff --git a/src/gui/kernel/qgenericpluginfactory_qpa.h b/src/gui/kernel/qgenericpluginfactory_qpa.h
index 86886f1..59eac38 100644
--- a/src/gui/kernel/qgenericpluginfactory_qpa.h
+++ b/src/gui/kernel/qgenericpluginfactory_qpa.h
@@ -39,8 +39,8 @@
**
****************************************************************************/
-#ifndef QGENERICPLUGINFACTORY_LITE_H
-#define QGENERICPLUGINFACTORY_LITE_H
+#ifndef QGENERICPLUGINFACTORY_QPA_H
+#define QGENERICPLUGINFACTORY_QPA_H
#include <QtCore/qstringlist.h>
@@ -64,4 +64,4 @@ QT_END_NAMESPACE
QT_END_HEADER
-#endif // QGENERICPLUGINFACTORY_QWS_H
+#endif // QGENERICPLUGINFACTORY_QPA_H
diff --git a/src/gui/kernel/qwidget_qpa.cpp b/src/gui/kernel/qwidget_qpa.cpp
index a543c8f..8bb3f38 100644
--- a/src/gui/kernel/qwidget_qpa.cpp
+++ b/src/gui/kernel/qwidget_qpa.cpp
@@ -246,14 +246,14 @@ void QWidgetPrivate::setCursor_sys(const QCursor &cursor)
Q_UNUSED(cursor);
Q_Q(QWidget);
if (q->isVisible())
- qt_lite_set_cursor(q, false);
+ qt_qpa_set_cursor(q, false);
}
void QWidgetPrivate::unsetCursor_sys()
{
Q_Q(QWidget);
if (q->isVisible())
- qt_lite_set_cursor(q, false);
+ qt_qpa_set_cursor(q, false);
}
void QWidgetPrivate::updateCursor() const
@@ -753,7 +753,7 @@ void QWidgetPrivate::setModal_sys()
}
#ifndef QT_NO_CURSOR
-void qt_lite_set_cursor(QWidget * w, bool force)
+void qt_qpa_set_cursor(QWidget * w, bool force)
{
static QCursor arrowCursor(Qt::ArrowCursor);
static QPointer<QWidget> lastUnderMouse = 0;
diff --git a/src/gui/kernel/qwindowsysteminterface.cpp b/src/gui/kernel/qwindowsysteminterface.cpp
index c9d177d..4cf9ded 100644
--- a/src/gui/kernel/qwindowsysteminterface.cpp
+++ b/src/gui/kernel/qwindowsysteminterface.cpp
@@ -129,7 +129,7 @@ void QWindowSystemInterfacePrivate::queueUserEvent(QWindowSystemInterface::UserE
userEventQueue.append(ev);
queueMutex.unlock();
- QAbstractEventDispatcher *dispatcher = QApplicationPrivate::qt_lite_core_dispatcher();
+ QAbstractEventDispatcher *dispatcher = QApplicationPrivate::qt_qpa_core_dispatcher();
if (dispatcher)
dispatcher->wakeUp();
}
generated by cgit v0.12 at 2024-11-14 17:34:02 (GMT)