diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-02-29 09:18:59 +1000 |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-02-29 09:23:14 +1000 |
| commit | 98dd1781d9256f68025d2a2db408f4f5947f3214 (patch) | |
| tree | dbe1424abd90014edb5546c920ca585ed62b46e3 /src/gui | |
| parent | 6c1bdc1854a7700c2b3a345b95f6a2fdca84037d (diff) | |
| parent | fa1b9070af66edb81b2a3735c1951f78b22bd666 (diff) | |
Merge master -> api_changes
Includes fixes for tst_qfiledialog2, tst_qtextedit autotests on mac.
Change-Id: I49cac26894d31291a8339ccc1eb80b6a940f0827
Diffstat (limited to 'src/gui')
39 files changed, 1740 insertions, 532 deletions
diff --git a/src/gui/accessible/qaccessible.cpp b/src/gui/accessible/qaccessible.cpp index 0d00df2a17..37e7a1dbb4 100644 --- a/src/gui/accessible/qaccessible.cpp +++ b/src/gui/accessible/qaccessible.cpp @@ -61,6 +61,7 @@ QT_BEGIN_NAMESPACE \class QAccessible \brief The QAccessible class provides enums and static functions related to accessibility. + \internal \ingroup accessibility \inmodule QtWidgets @@ -364,6 +365,8 @@ QT_BEGIN_NAMESPACE \value Labelled The first object is labelled by the second object. \value Controller The first object controls the second object. \value Controlled The first object is controlled by the second object. + \value AllRelations Used as a mask to specify that we are interesting in information + about all relations Implementations of relations() return a combination of these flags. Some values are mutually exclusive. @@ -690,6 +693,7 @@ void QAccessible::updateAccessibility(const QAccessibleEvent &event) \class QAccessibleEvent \brief The QAccessibleEvent is use to notify about changes that are relevant for accessibility in the application. + \internal \ingroup accessibility \inmodule QtGui @@ -725,6 +729,7 @@ QAccessibleInterface *QAccessibleEvent::accessibleInterface() const \class QAccessibleInterface \brief The QAccessibleInterface class defines an interface that exposes information about accessible objects. + \internal \ingroup accessibility \inmodule QtGui @@ -1170,6 +1175,7 @@ const char *qAccessibleEventString(QAccessible::Event event) return QAccessible::staticMetaObject.enumerator(eventEnum).valueToKey(event); } +/*! \internal */ bool operator==(const QAccessible::State &first, const QAccessible::State &second) { return memcmp(&first, &second, sizeof(QAccessible::State)) == 0; diff --git a/src/gui/accessible/qaccessible.h b/src/gui/accessible/qaccessible.h index e57033d9bf..a72b91a90f 100644 --- a/src/gui/accessible/qaccessible.h +++ b/src/gui/accessible/qaccessible.h @@ -306,10 +306,10 @@ public: }; enum RelationFlag { - Label = 0x00020000, - Labelled = 0x00040000, - Controller = 0x00080000, - Controlled = 0x00100000, + Label = 0x00000001, + Labelled = 0x00000002, + Controller = 0x00000004, + Controlled = 0x00000008, AllRelations = 0xffffffff }; Q_DECLARE_FLAGS(Relation, RelationFlag) diff --git a/src/gui/accessible/qaccessible2.cpp b/src/gui/accessible/qaccessible2.cpp index 0f854c6158..db3028b371 100644 --- a/src/gui/accessible/qaccessible2.cpp +++ b/src/gui/accessible/qaccessible2.cpp @@ -51,6 +51,7 @@ QT_BEGIN_NAMESPACE /*! \namespace QAccessible2 \ingroup accessibility + \internal \brief The QAccessible2 namespace defines constants relating to IAccessible2-based interfaces @@ -60,6 +61,7 @@ QT_BEGIN_NAMESPACE /*! \class QAccessibleTextInterface + \internal \ingroup accessibility @@ -180,6 +182,7 @@ QT_BEGIN_NAMESPACE /*! \class QAccessibleEditableTextInterface \ingroup accessibility + \internal \brief The QAccessibleEditableTextInterface class implements support for objects with editable text. @@ -247,6 +250,7 @@ QT_BEGIN_NAMESPACE /*! \class QAccessibleSimpleEditableTextInterface \ingroup accessibility + \internal \brief The QAccessibleSimpleEditableTextInterface class is a convenience class for text-based widgets. It can be inherited instead of \l QAccessibleEditableTextInterface. @@ -259,6 +263,7 @@ QT_BEGIN_NAMESPACE /*! \class QAccessibleValueInterface \ingroup accessibility + \internal \brief The QAccessibleValueInterface class implements support for objects that manipulate a value. @@ -323,6 +328,7 @@ QT_BEGIN_NAMESPACE /*! \class QAccessibleTableCellInterface \ingroup accessibility + \internal \brief The QAccessibleTableCellInterface class implements support for the IAccessibleTable2 Cell interface. @@ -333,6 +339,7 @@ QT_BEGIN_NAMESPACE /*! \class QAccessibleTableInterface \ingroup accessibility + \internal \brief The QAccessibleTableInterface class implements support for the IAccessibleTable2 interface. @@ -344,6 +351,7 @@ QT_BEGIN_NAMESPACE /*! \class QAccessibleActionInterface \ingroup accessibility + \internal \brief The QAccessibleActionInterface class implements support for invocable actions in the interface. diff --git a/src/gui/accessible/qaccessiblebridge.cpp b/src/gui/accessible/qaccessiblebridge.cpp index 8fcf0474a1..d6d0796701 100644 --- a/src/gui/accessible/qaccessiblebridge.cpp +++ b/src/gui/accessible/qaccessiblebridge.cpp @@ -49,6 +49,7 @@ QT_BEGIN_NAMESPACE \class QAccessibleBridge \brief The QAccessibleBridge class is the base class for accessibility back-ends. + \internal \ingroup accessibility \inmodule QtWidgets @@ -100,6 +101,7 @@ QT_BEGIN_NAMESPACE \class QAccessibleBridgePlugin \brief The QAccessibleBridgePlugin class provides an abstract base for accessibility bridge plugins. + \internal \ingroup plugins \ingroup accessibility diff --git a/src/gui/accessible/qaccessibleobject.cpp b/src/gui/accessible/qaccessibleobject.cpp index d277f39c43..e587ad077c 100644 --- a/src/gui/accessible/qaccessibleobject.cpp +++ b/src/gui/accessible/qaccessibleobject.cpp @@ -92,6 +92,7 @@ QList<QByteArray> QAccessibleObjectPrivate::actionList() const \class QAccessibleObject \brief The QAccessibleObject class implements parts of the QAccessibleInterface for QObjects. + \internal \ingroup accessibility \inmodule QtWidgets diff --git a/src/gui/accessible/qaccessibleplugin.cpp b/src/gui/accessible/qaccessibleplugin.cpp index 8823d63b79..c2fe9c7a7a 100644 --- a/src/gui/accessible/qaccessibleplugin.cpp +++ b/src/gui/accessible/qaccessibleplugin.cpp @@ -52,6 +52,7 @@ QT_BEGIN_NAMESPACE \class QAccessiblePlugin \brief The QAccessiblePlugin class provides an abstract base for accessibility plugins. + \internal \ingroup plugins \ingroup accessibility diff --git a/src/gui/kernel/qclipboard_qpa.cpp b/src/gui/kernel/qclipboard_qpa.cpp index b33ccd42a2..0d97fdd0be 100644 --- a/src/gui/kernel/qclipboard_qpa.cpp +++ b/src/gui/kernel/qclipboard_qpa.cpp @@ -76,8 +76,6 @@ void QClipboard::setMimeData(QMimeData* src, Mode mode) if (!clipboard->supportsMode(mode)) return; clipboard->setMimeData(src,mode); - - emitChanged(mode); } bool QClipboard::supportsMode(Mode mode) const diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp index c3a6be692b..281d4f61bc 100644 --- a/src/gui/kernel/qevent.cpp +++ b/src/gui/kernel/qevent.cpp @@ -453,7 +453,13 @@ QHoverEvent::~QHoverEvent() Wheel events are sent to the widget under the mouse cursor, but if that widget does not handle the event they are sent to the - focus widget. The rotation distance is provided by delta(). + focus widget. Wheel events are generated for both mouse wheels + and trackpad scroll gestures. There are two ways to read the + wheel event delta: angleDelta() returns the delta in wheel + degrees. This value is always provided. pixelDelta() returns + the delta in screen pixels and is available on platforms that + have high-resolution trackpads, such as Mac OS X. + The functions pos() and globalPos() return the mouse cursor's location at the time of the event. @@ -483,8 +489,11 @@ QHoverEvent::~QHoverEvent() */ /*! + \obsolete Constructs a wheel event object. + Use the QPoint-based constructor instead. + The position, \a pos, is the location of the mouse cursor within the widget. The globalPos() is initialized to QCursor::pos() which is usually, but not always, correct. @@ -496,13 +505,13 @@ QHoverEvent::~QHoverEvent() \a modifiers holds the keyboard modifier flags at the time of the event, and \a orient holds the wheel's orientation. - \sa pos() delta() state() + \sa pos() pixelDelta() angleDelta() state() */ #ifndef QT_NO_WHEELEVENT QWheelEvent::QWheelEvent(const QPointF &pos, int delta, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, Qt::Orientation orient) - : QInputEvent(Wheel, modifiers), p(pos), d(delta), mouseState(buttons), o(orient) + : QInputEvent(Wheel, modifiers), p(pos), qt4D(delta), qt4O(orient), mouseState(buttons) { g = QCursor::pos(); } @@ -515,26 +524,69 @@ QWheelEvent::~QWheelEvent() } /*! + \obsolete Constructs a wheel event object. + Use the QPoint-based constructor instead. + The \a pos provides the location of the mouse cursor within the widget. The position in global coordinates is specified by \a globalPos. \a delta contains the rotation distance, \a modifiers holds the keyboard modifier flags at the time of the event, and \a orient holds the wheel's orientation. - \sa pos() globalPos() delta() state() + + \sa pos() pixelDelta() angleDelta() state() */ QWheelEvent::QWheelEvent(const QPointF &pos, const QPointF& globalPos, int delta, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, Qt::Orientation orient) - : QInputEvent(Wheel, modifiers), p(pos), g(globalPos), d(delta), mouseState(buttons), o(orient) + : QInputEvent(Wheel, modifiers), p(pos), g(globalPos), qt4D(delta), qt4O(orient), mouseState(buttons) +{} + +/*! + Constructs a wheel event object. + + The \a pos provides the location of the mouse cursor + within the window. The position in global coordinates is specified + by \a globalPos. \pixelDelta contains the scrolling distance + in pixels on screen, \a angleDelta contains the wheel rotation distance. + \pixelDelta is optional and can be null. + + \a modifiers holds the keyboard modifier flags at the time of the event. + + \a pixelDelta contains the scrolling delta in pixels, + \a angleDelta contains the rotation distance, and + \a orient holds the wheel's orientation. + + \sa pos() globalPos() delta() state() +*/ + +QWheelEvent::QWheelEvent(const QPointF &pos, const QPointF& globalPos, + QPoint pixelDelta, QPoint angleDelta, int qt4Delta, Qt::Orientation qt4Orientation, + Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers) + : QInputEvent(Wheel, modifiers), p(pos), g(globalPos), pixelD(pixelDelta), + angleD(angleDelta), qt4D(qt4Delta), qt4O(qt4Orientation), mouseState(buttons) {} + #endif // QT_NO_WHEELEVENT /*! - \fn int QWheelEvent::delta() const + \fn QPoint QWheelEvent::pixelDelta() const + + Returns the scrolling distance in pixels on screen. This value is + provided on platforms that support high-resolution pixel-based + delta values, such as Mac OS X. The value should be used directly + to scroll content on screen. + + Example: + + \snippet doc/src/snippets/code/src_gui_kernel_qevent.cpp 0 +*/ + +/*! + \fn QPoint QWheelEvent::angleDelta() const Returns the distance that the wheel is rotated, in eighths of a degree. A positive value indicates that the wheel was rotated @@ -556,6 +608,12 @@ QWheelEvent::QWheelEvent(const QPointF &pos, const QPointF& globalPos, int delta */ /*! + \fn int QWheelEvent::delta() const + + This function has been deprecated, use pixelDelta() or angleDelta() instead. +*/ + +/*! \fn const QPoint &QWheelEvent::pos() const Returns the position of the mouse cursor relative to the widget @@ -833,7 +891,7 @@ Qt::KeyboardModifiers QKeyEvent::modifiers() const bool QKeyEvent::matches(QKeySequence::StandardKey matchKey) const { uint searchkey = (modifiers() | key()) & ~(Qt::KeypadModifier); //The keypad modifier should not make a difference - uint platform = QGuiApplicationPrivate::currentKeyPlatform(); + const uint platform = QKeySequencePrivate::currentKeyPlatforms(); uint N = QKeySequencePrivate::numberOfKeyBindings; @@ -2887,7 +2945,6 @@ QShortcutEvent::~QShortcutEvent() #ifndef QT_NO_DEBUG_STREAM QDebug operator<<(QDebug dbg, const QEvent *e) { -#ifndef Q_BROKEN_DEBUG_STREAM // More useful event output could be added here if (!e) return dbg << "QEvent(this = 0x0)"; @@ -3168,11 +3225,6 @@ QDebug operator<<(QDebug dbg, const QEvent *e) { dbg.nospace() << 'Q' << n << "Event(" << (const void *)e << ')'; return dbg.space(); -#else - qWarning("This compiler doesn't support streaming QEvent to QDebug"); - return dbg; - Q_UNUSED(e); -#endif } #endif diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h index 93dea41de9..ca93095a94 100644 --- a/src/gui/kernel/qevent.h +++ b/src/gui/kernel/qevent.h @@ -148,9 +148,21 @@ public: QWheelEvent(const QPointF &pos, const QPointF& globalPos, int delta, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, Qt::Orientation orient = Qt::Vertical); + QWheelEvent(const QPointF &pos, const QPointF& globalPos, + QPoint pixelDelta, QPoint angleDelta, int qt4Delta, Qt::Orientation qt4Orientation, + Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers); + ~QWheelEvent(); - inline int delta() const { return d; } + + inline QPoint pixelDelta() const { return pixelD; } + inline QPoint angleDelta() const { return angleD; } + +#if QT_DEPRECATED_SINCE(5, 0) + inline QT_DEPRECATED int delta() const { return qt4D; } + inline QT_DEPRECATED Qt::Orientation orientation() const { return qt4O; } +#endif + #ifndef QT_NO_INTEGER_EVENT_COORDINATES inline QPoint pos() const { return p.toPoint(); } inline QPoint globalPos() const { return g.toPoint(); } @@ -163,15 +175,15 @@ public: inline const QPointF &globalPosF() const { return g; } inline Qt::MouseButtons buttons() const { return mouseState; } - Qt::Orientation orientation() const { return o; } - - protected: QPointF p; QPointF g; - int d; + QPoint pixelD; + QPoint angleD; + int qt4D; + Qt::Orientation qt4O; Qt::MouseButtons mouseState; - Qt::Orientation o; + int reserved; }; #endif diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 7cb3d4b488..1cd448a6bb 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -99,6 +99,14 @@ QPlatformTheme *QGuiApplicationPrivate::platform_theme = 0; QList<QObject *> QGuiApplicationPrivate::generic_plugin_list; +enum ApplicationResourceFlags +{ + ApplicationPaletteExplicitlySet = 0x1, + ApplicationFontExplicitlySet = 0x2 +}; + +static unsigned applicationResourceFlags = 0; + bool QGuiApplicationPrivate::app_do_modal = false; QPalette *QGuiApplicationPrivate::app_pal = 0; // default application palette @@ -144,7 +152,169 @@ static bool qt_detectRTLLanguage() " and Arabic) to get proper widget layout.") == QLatin1String("RTL")); } +static void initPalette() +{ + if (!QGuiApplicationPrivate::app_pal) + if (const QPalette *themePalette = QGuiApplicationPrivate::platformTheme()->palette()) + QGuiApplicationPrivate::app_pal = new QPalette(*themePalette); + if (!QGuiApplicationPrivate::app_pal) + QGuiApplicationPrivate::app_pal = new QPalette(Qt::black); +} + +static inline void clearPalette() +{ + delete QGuiApplicationPrivate::app_pal; + QGuiApplicationPrivate::app_pal = 0; +} + +static void initFontUnlocked() +{ + if (!QGuiApplicationPrivate::app_font) + QGuiApplicationPrivate::app_font = + new QFont(QGuiApplicationPrivate::platformIntegration()->fontDatabase()->defaultFont()); +} + +static inline void clearFontUnlocked() +{ + delete QGuiApplicationPrivate::app_font; + QGuiApplicationPrivate::app_font = 0; +} + +/*! + \class QGuiApplication + \brief The QGuiApplication class manages the GUI application's control + flow and main settings. + + \inmodule QtGui + + QGuiApplication contains the main event loop, where all events from the window + system and other sources are processed and dispatched. It also handles the + application's initialization and finalization. In addition, QGuiApplication handles + most of the system-wide and application-wide settings. + + For any GUI application using Qt, there is precisely \bold one QGuiApplication + object no matter whether the application has 0, 1, 2 or more windows at + any given time. For non-GUI Qt applications, use QCoreApplication instead, + as it does not depend on the \l QtGui library. + + The QGuiApplication object is accessible through the instance() function, which + returns a pointer equivalent to the global \l qApp pointer. + + QGuiApplication's main areas of responsibility are: + \list + \o It initializes the application with the user's desktop settings, + such as palette(), font() and styleHints(). It keeps + track of these properties in case the user changes the desktop + globally, for example, through some kind of control panel. + + \o It performs event handling, meaning that it receives events + from the underlying window system and dispatches them to the + relevant widgets. You can send your own events to windows by + using sendEvent() and postEvent(). + + \o It parses common command line arguments and sets its internal + state accordingly. See the \l{QGuiApplication::QGuiApplication()} + {constructor documentation} below for more details. + + \o It provides localization of strings that are visible to the + user via translate(). + + \o It provides some magical objects like the clipboard(). + + \o It knows about the application's windows. You can ask which + window is at a certain position using topLevelAt(), get a list of + topLevelWindows(), etc. + + \o It manages the application's mouse cursor handling, see + setOverrideCursor() + \endlist + + Since the QGuiApplication object does so much initialization, it \e{must} be + created before any other objects related to the user interface are created. + QGuiApplication also deals with common command line arguments. Hence, it is + usually a good idea to create it \e before any interpretation or + modification of \c argv is done in the application itself. + + \table + \header + \o{2,1} Groups of functions + + \row + \o System settings + \o desktopSettingsAware(), + setDesktopSettingsAware(), + styleHints(), + palette(), + setPalette(), + font(), + setFont(). + + \row + \o Event handling + \o exec(), + processEvents(), + exit(), + quit(). + sendEvent(), + postEvent(), + sendPostedEvents(), + removePostedEvents(), + hasPendingEvents(), + notify(). + + \row + \o Windows + \o allWindows(), + topLevelWindows(), + focusWindow(), + clipboard(), + topLevelAt(). + + \row + \o Advanced cursor handling + \o overrideCursor(), + setOverrideCursor(), + restoreOverrideCursor(). + + \row + \o Miscellaneous + \o startingUp(), + closingDown(), + type(). + \endtable + + \sa QCoreApplication, QAbstractEventDispatcher, QEventLoop +*/ + +/*! + Initializes the window system and constructs an application object with + \a argc command line arguments in \a argv. + + \warning The data referred to by \a argc and \a argv must stay valid for + the entire lifetime of the QGuiApplication object. In addition, \a argc must + be greater than zero and \a argv must contain at least one valid character + string. + + The global \c qApp pointer refers to this application object. Only one + application object should be created. + + This application object must be constructed before any \l{QPaintDevice} + {paint devices} (including pixmaps, bitmaps etc.). + + \note \a argc and \a argv might be changed as Qt removes command line + arguments that it recognizes. + All Qt programs automatically support the following command line options: + \list + \o -reverse, sets the application's layout direction to + Qt::RightToLeft + \o -qmljsdebugger=, activates the QML/JS debugger with a specified port. + The value must be of format port:1234[,block], where block is optional + and will make the application wait until a debugger connects to it. + \endlist + + \sa arguments() +*/ QGuiApplication::QGuiApplication(int &argc, char **argv, int flags) : QCoreApplication(*new QGuiApplicationPrivate(argc, argv, flags)) { @@ -159,6 +329,9 @@ QGuiApplication::QGuiApplication(QGuiApplicationPrivate &p) d_func()->init(); } +/*! + Destructs the application. +*/ QGuiApplication::~QGuiApplication() { Q_D(QGuiApplication); @@ -174,8 +347,7 @@ QGuiApplication::~QGuiApplication() delete QGuiApplicationPrivate::qt_clipboard; QGuiApplicationPrivate::qt_clipboard = 0; - delete QGuiApplicationPrivate::app_pal; - QGuiApplicationPrivate::app_pal = 0; + clearPalette(); qUnregisterGuiVariant(); @@ -194,6 +366,10 @@ QGuiApplicationPrivate::QGuiApplicationPrivate(int &argc, char **argv, int flags application_type = QCoreApplication::GuiClient; } +/*! + Returns the QWindow that receives events tied to focus, + such as key events. +*/ QWindow *QGuiApplication::focusWindow() { return QGuiApplicationPrivate::focus_window; @@ -208,7 +384,7 @@ QWindow *QGuiApplication::focusWindow() /*! Returns the QObject in currently active window that will be final receiver of events - tied focus, such as key events. + tied to focus, such as key events. */ QObject *QGuiApplication::focusObject() { @@ -249,6 +425,11 @@ QWindowList QGuiApplication::topLevelWindows() return topLevelWindows; } +/*! + Returns the primary (or default) screen of the application. + + This will be the screen where QWindows are shown, unless otherwise specified. +*/ QScreen *QGuiApplication::primaryScreen() { if (QGuiApplicationPrivate::screen_list.isEmpty()) @@ -256,11 +437,18 @@ QScreen *QGuiApplication::primaryScreen() return QGuiApplicationPrivate::screen_list.at(0); } +/*! + Returns a list of all the screens associated with the + windowing system the application is connected to. +*/ QList<QScreen *> QGuiApplication::screens() { return QGuiApplicationPrivate::screen_list; } +/*! + Returns the top level window at the given position, if any. +*/ QWindow *QGuiApplication::topLevelAt(const QPoint &pos) { QList<QScreen *> screens = QGuiApplication::screens(); @@ -517,8 +705,8 @@ QGuiApplicationPrivate::~QGuiApplicationPrivate() delete generic_plugin_list.at(i); generic_plugin_list.clear(); - delete app_font; - app_font = 0; + clearFontUnlocked(); + QFont::cleanup(); #ifndef QT_NO_CURSOR @@ -557,27 +745,62 @@ static QClipboard *clipboard(); #endif #endif +/*! + Returns the currently held keyboard modifiers. +*/ Qt::KeyboardModifiers QGuiApplication::keyboardModifiers() { return QGuiApplicationPrivate::modifier_buttons; } +/*! + Returns the currently held mouse buttons. +*/ Qt::MouseButtons QGuiApplication::mouseButtons() { return QGuiApplicationPrivate::mouse_buttons; } +/*! + Returns the platform's native interface, for platform specific + functionality. +*/ QPlatformNativeInterface *QGuiApplication::platformNativeInterface() { QPlatformIntegration *pi = QGuiApplicationPrivate::platformIntegration(); return pi->nativeInterface(); } +/*! + Enters the main event loop and waits until exit() is called, and then + returns the value that was set to exit() (which is 0 if exit() is called + via quit()). + + It is necessary to call this function to start event handling. The main + event loop receives events from the window system and dispatches these to + the application widgets. + + Generally, no user interaction can take place before calling exec(). + + To make your application perform idle processing, e.g., executing a special + function whenever there are no pending events, use a QTimer with 0 timeout. + More advanced idle processing schemes can be achieved using processEvents(). + + We recommend that you connect clean-up code to the + \l{QCoreApplication::}{aboutToQuit()} signal, instead of putting it in your + application's \c{main()} function. This is because, on some platforms, the + QApplication::exec() call may not return. + + \sa quitOnLastWindowClosed, quit(), exit(), processEvents(), + QCoreApplication::exec() +*/ int QGuiApplication::exec() { return QCoreApplication::exec(); } +/*! \reimp +*/ bool QGuiApplication::notify(QObject *object, QEvent *event) { #ifndef QT_NO_SHORTCUT @@ -595,6 +818,8 @@ bool QGuiApplication::notify(QObject *object, QEvent *event) return QCoreApplication::notify(object, event); } +/*! \reimp +*/ bool QGuiApplication::event(QEvent *e) { if(e->type() == QEvent::LanguageChange) { @@ -603,6 +828,9 @@ bool QGuiApplication::event(QEvent *e) return QCoreApplication::event(e); } +/*! + \internal +*/ bool QGuiApplication::compressEvent(QEvent *event, QObject *receiver, QPostEventList *postedEvents) { return QCoreApplication::compressEvent(event, receiver, postedEvents); @@ -804,8 +1032,7 @@ void QGuiApplicationPrivate::processWheelEvent(QWindowSystemInterfacePrivate::Wh QWindow *window = e->window.data(); if (window) { - QWheelEvent ev(e->localPos, e->globalPos, e->delta, buttons, e->modifiers, - e->orient); + QWheelEvent ev(e->localPos, e->globalPos, e->pixelDelta, e->angleDelta, e->qt4Delta, e->qt4Orientation, buttons, e->modifiers); ev.setTimestamp(e->timestamp); QGuiApplication::sendSpontaneousEvent(window, &ev); return; @@ -896,6 +1123,8 @@ void QGuiApplicationPrivate::processWindowStateChangedEvent(QWindowSystemInterfa void QGuiApplicationPrivate::processThemeChanged(QWindowSystemInterfacePrivate::ThemeChangeEvent *tce) { + if (self) + self->notifyThemeChanged(); if (QWindow *window = tce->window.data()) { QEvent e(QEvent::ThemeChange); QGuiApplication::sendSpontaneousEvent(window, &e); @@ -1364,6 +1593,9 @@ Qt::DropAction QGuiApplicationPrivate::processDrop(QWindow *w, QMimeData *dropDa } #ifndef QT_NO_CLIPBOARD +/*! + Returns the object for interacting with the clipboard. +*/ QClipboard * QGuiApplication::clipboard() { if (QGuiApplicationPrivate::qt_clipboard == 0) { @@ -1378,20 +1610,22 @@ QClipboard * QGuiApplication::clipboard() #endif /*! - Returns the application palette. + Returns the default application palette. - \sa setPalette(), QWidget::palette() + \sa setPalette() */ + QPalette QGuiApplication::palette() { - if (!QGuiApplicationPrivate::app_pal) - if (const QPalette *themePalette = QGuiApplicationPrivate::platformTheme()->palette()) - QGuiApplicationPrivate::app_pal = new QPalette(*themePalette); - if (!QGuiApplicationPrivate::app_pal) - QGuiApplicationPrivate::app_pal = new QPalette(Qt::black); + initPalette(); return *QGuiApplicationPrivate::app_pal; } +/*! + Changes the default application palette to \a palette. + + \sa palette() +*/ void QGuiApplication::setPalette(const QPalette &pal) { if (QGuiApplicationPrivate::app_pal && pal.isCopyOf(*QGuiApplicationPrivate::app_pal)) @@ -1400,17 +1634,26 @@ void QGuiApplication::setPalette(const QPalette &pal) QGuiApplicationPrivate::app_pal = new QPalette(pal); else *QGuiApplicationPrivate::app_pal = pal; + applicationResourceFlags |= ApplicationPaletteExplicitlySet; } +/*! + Returns the default application font. + + \sa setFont() +*/ QFont QGuiApplication::font() { QMutexLocker locker(&applicationFontMutex); - if (!QGuiApplicationPrivate::app_font) - QGuiApplicationPrivate::app_font = - new QFont(QGuiApplicationPrivate::platformIntegration()->fontDatabase()->defaultFont()); + initFontUnlocked(); return *QGuiApplicationPrivate::app_font; } +/*! + Changes the default application font to \a font. + + \sa font() +*/ void QGuiApplication::setFont(const QFont &font) { QMutexLocker locker(&applicationFontMutex); @@ -1418,6 +1661,7 @@ void QGuiApplication::setFont(const QFont &font) QGuiApplicationPrivate::app_font = new QFont(font); else *QGuiApplicationPrivate::app_font = font; + applicationResourceFlags |= ApplicationFontExplicitlySet; } /*! @@ -1631,7 +1875,7 @@ void QGuiApplication::restoreOverrideCursor() /*! \since 5.0 - returns the style hints. + Returns the application's style hints. The style hints encapsulate a set of platform dependent properties such as double click intervals, full width selection and others. @@ -1675,6 +1919,14 @@ bool QGuiApplication::desktopSettingsAware() return QGuiApplicationPrivate::obey_desktop_settings; } +QInputMethod *QGuiApplication::inputMethod() const +{ + Q_D(const QGuiApplication); + if (!d->inputMethod) + const_cast<QGuiApplicationPrivate *>(d)->inputMethod = new QInputMethod(); + return d->inputMethod; +} + /*! \since 5.0 @@ -1686,40 +1938,11 @@ bool QGuiApplication::desktopSettingsAware() \sa QInputPanel */ -QInputMethod *QGuiApplication::inputMethod() const -{ - Q_D(const QGuiApplication); - if (!d->inputMethod) - const_cast<QGuiApplicationPrivate *>(d)->inputMethod = new QInputMethod(); - return d->inputMethod; -} - QInputPanel *QGuiApplication::inputPanel() const { return inputMethod(); } - -// Returns the current platform used by keyBindings -uint QGuiApplicationPrivate::currentKeyPlatform() -{ - uint platform = KB_Win; -#ifdef Q_OS_MAC - platform = KB_Mac; -#elif defined Q_WS_X11 // ## TODO: detect these - platform = KB_X11; -#if 0 - if (X11->desktopEnvironment == DE_KDE) - platform |= KB_KDE; - if (X11->desktopEnvironment == DE_GNOME) - platform |= KB_Gnome; - if (X11->desktopEnvironment == DE_CDE) - platform |= KB_CDE; -#endif -#endif - return platform; -} - /*! \since 4.5 \fn void QGuiApplication::fontDatabaseChanged() @@ -1843,4 +2066,17 @@ QPixmap QGuiApplicationPrivate::getPixmapCursor(Qt::CursorShape cshape) return QPixmap(); } +void QGuiApplicationPrivate::notifyThemeChanged() +{ + if (!(applicationResourceFlags & ApplicationPaletteExplicitlySet)) { + clearPalette(); + initPalette(); + } + if (!(applicationResourceFlags & ApplicationFontExplicitlySet)) { + QMutexLocker locker(&applicationFontMutex); + clearFontUnlocked(); + initFontUnlocked(); + } +} + QT_END_NAMESPACE diff --git a/src/gui/kernel/qguiapplication_p.h b/src/gui/kernel/qguiapplication_p.h index 7e6e0aa8c7..68546ce0cf 100644 --- a/src/gui/kernel/qguiapplication_p.h +++ b/src/gui/kernel/qguiapplication_p.h @@ -89,19 +89,6 @@ public: static QPlatformTheme *platformTheme() { return platform_theme; } - - enum KeyPlatform { - KB_Win = 1, - KB_Mac = 2, - KB_X11 = 4, - KB_KDE = 8, - KB_Gnome = 16, - KB_CDE = 32, - KB_All = 0xffff - }; - - static uint currentKeyPlatform(); - static QAbstractEventDispatcher *qt_qpa_core_dispatcher() { return QCoreApplication::instance()->d_func()->threadData->eventDispatcher; } @@ -213,6 +200,9 @@ public: }; QHash<QWindow *, SynthesizedMouseData> synthesizedMousePoints; +protected: + virtual void notifyThemeChanged(); + private: void init(); diff --git a/src/gui/kernel/qguivariant.cpp b/src/gui/kernel/qguivariant.cpp index 8378650dcb..50d3f0b7d1 100644 --- a/src/gui/kernel/qguivariant.cpp +++ b/src/gui/kernel/qguivariant.cpp @@ -221,7 +221,7 @@ static bool compare(const QVariant::Private *a, const QVariant::Private *b) return QMetaTypeSwitcher::switcher<bool>(comparator, a->type, 0); } -static bool convert(const QVariant::Private *d, QVariant::Type t, +static bool convert(const QVariant::Private *d, int t, void *result, bool *ok) { switch (t) { @@ -236,7 +236,7 @@ static bool convert(const QVariant::Private *d, QVariant::Type t, switch (d->type) { #ifndef QT_NO_SHORTCUT case QVariant::KeySequence: - *str = QString(*v_cast<QKeySequence>(d)); + *str = (*v_cast<QKeySequence>(d)).toString(QKeySequence::NativeText); return true; #endif case QVariant::Font: @@ -285,7 +285,8 @@ static bool convert(const QVariant::Private *d, QVariant::Type t, #ifndef QT_NO_SHORTCUT case QVariant::Int: if (d->type == QVariant::KeySequence) { - *static_cast<int *>(result) = (int)(*(v_cast<QKeySequence>(d))); + const QKeySequence &seq = *v_cast<QKeySequence>(d); + *static_cast<int *>(result) = seq.isEmpty() ? 0 : seq[0]; return true; } break; @@ -342,7 +343,7 @@ static bool convert(const QVariant::Private *d, QVariant::Type t, return qcoreVariantHandler()->convert(d, t, result, ok); } -#if !defined(QT_NO_DEBUG_STREAM) && !defined(Q_BROKEN_DEBUG_STREAM) +#if !defined(QT_NO_DEBUG_STREAM) static void streamDebug(QDebug dbg, const QVariant &v) { QVariant::Private *d = const_cast<QVariant::Private *>(&v.data_ptr()); @@ -362,7 +363,7 @@ const QVariant::Handler qt_gui_variant_handler = { compare, convert, 0, -#if !defined(QT_NO_DEBUG_STREAM) && !defined(Q_BROKEN_DEBUG_STREAM) +#if !defined(QT_NO_DEBUG_STREAM) streamDebug #else 0 diff --git a/src/gui/kernel/qinputmethod.cpp b/src/gui/kernel/qinputmethod.cpp index de00396e40..9e724446ff 100644 --- a/src/gui/kernel/qinputmethod.cpp +++ b/src/gui/kernel/qinputmethod.cpp @@ -154,9 +154,9 @@ QRectF QInputMethod::cursorRectangle() const QInputMethodQueryEvent query(Qt::ImCursorRectangle); QGuiApplication::sendEvent(d->inputItem.data(), &query); - QRect r = query.value(Qt::ImCursorRectangle).toRect(); + QRectF r = query.value(Qt::ImCursorRectangle).toRectF(); if (!r.isValid()) - return QRect(); + return QRectF(); return d->inputItemTransform.mapRect(r); } diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp index 021135b6fe..7053f01196 100644 --- a/src/gui/kernel/qkeysequence.cpp +++ b/src/gui/kernel/qkeysequence.cpp @@ -41,6 +41,7 @@ #include "qkeysequence.h" #include "qkeysequence_p.h" +#include "qplatformtheme_qpa.h" #include "private/qguiapplication_p.h" #ifndef QT_NO_SHORTCUT @@ -640,153 +641,163 @@ static const struct { //Table of key bindings. It must be sorted on key sequence. //A priority of 1 indicates that this is the primary key binding when multiple are defined. +enum KeyPlatform { + KB_Win = (1 << QPlatformTheme::WindowsKeyboardScheme), + KB_Mac = (1 << QPlatformTheme::MacKeyboardScheme), + KB_X11 = (1 << QPlatformTheme::X11KeyboardScheme), + KB_KDE = (1 << QPlatformTheme::KdeKeyboardScheme), + KB_Gnome = (1 << QPlatformTheme::GnomeKeyboardScheme), + KB_CDE = (1 << QPlatformTheme::CdeKeyboardScheme), + KB_All = 0xffff +}; + const QKeyBinding QKeySequencePrivate::keyBindings[] = { // StandardKey Priority Key Sequence Platforms - {QKeySequence::Back, 0, Qt::Key_Backspace, QGuiApplicationPrivate::KB_Win}, - {QKeySequence::InsertParagraphSeparator,0, Qt::Key_Return, QGuiApplicationPrivate::KB_All}, - {QKeySequence::InsertParagraphSeparator,0, Qt::Key_Enter, QGuiApplicationPrivate::KB_All}, - {QKeySequence::Delete, 1, Qt::Key_Delete, QGuiApplicationPrivate::KB_All}, - {QKeySequence::MoveToStartOfLine, 0, Qt::Key_Home, QGuiApplicationPrivate::KB_Win | QGuiApplicationPrivate::KB_X11}, - {QKeySequence::MoveToStartOfDocument, 0, Qt::Key_Home, QGuiApplicationPrivate::KB_Mac}, - {QKeySequence::MoveToEndOfLine, 0, Qt::Key_End, QGuiApplicationPrivate::KB_Win | QGuiApplicationPrivate::KB_X11}, - {QKeySequence::MoveToEndOfDocument, 0, Qt::Key_End, QGuiApplicationPrivate::KB_Mac}, - {QKeySequence::MoveToPreviousChar, 0, Qt::Key_Left, QGuiApplicationPrivate::KB_All}, - {QKeySequence::MoveToPreviousLine, 0, Qt::Key_Up, QGuiApplicationPrivate::KB_All}, - {QKeySequence::MoveToNextChar, 0, Qt::Key_Right, QGuiApplicationPrivate::KB_All}, - {QKeySequence::MoveToNextLine, 0, Qt::Key_Down, QGuiApplicationPrivate::KB_All}, - {QKeySequence::MoveToPreviousPage, 1, Qt::Key_PageUp, QGuiApplicationPrivate::KB_All}, - {QKeySequence::MoveToNextPage, 1, Qt::Key_PageDown, QGuiApplicationPrivate::KB_All}, - {QKeySequence::HelpContents, 0, Qt::Key_F1, QGuiApplicationPrivate::KB_Win | QGuiApplicationPrivate::KB_X11}, - {QKeySequence::FindNext, 0, Qt::Key_F3, QGuiApplicationPrivate::KB_X11}, - {QKeySequence::FindNext, 1, Qt::Key_F3, QGuiApplicationPrivate::KB_Win}, - {QKeySequence::Refresh, 0, Qt::Key_F5, QGuiApplicationPrivate::KB_Win | QGuiApplicationPrivate::KB_X11}, - {QKeySequence::Undo, 0, Qt::Key_F14, QGuiApplicationPrivate::KB_X11}, //Undo on sun keyboards - {QKeySequence::Copy, 0, Qt::Key_F16, QGuiApplicationPrivate::KB_X11}, //Copy on sun keyboards - {QKeySequence::Paste, 0, Qt::Key_F18, QGuiApplicationPrivate::KB_X11}, //Paste on sun keyboards - {QKeySequence::Cut, 0, Qt::Key_F20, QGuiApplicationPrivate::KB_X11}, //Cut on sun keyboards - {QKeySequence::PreviousChild, 0, Qt::Key_Back, QGuiApplicationPrivate::KB_All}, - {QKeySequence::NextChild, 0, Qt::Key_Forward, QGuiApplicationPrivate::KB_All}, - {QKeySequence::Forward, 0, Qt::SHIFT | Qt::Key_Backspace, QGuiApplicationPrivate::KB_Win}, - {QKeySequence::InsertLineSeparator, 0, Qt::SHIFT | Qt::Key_Return, QGuiApplicationPrivate::KB_All}, - {QKeySequence::InsertLineSeparator, 0, Qt::SHIFT | Qt::Key_Enter, QGuiApplicationPrivate::KB_All}, - {QKeySequence::Paste, 0, Qt::SHIFT | Qt::Key_Insert, QGuiApplicationPrivate::KB_Win | QGuiApplicationPrivate::KB_X11}, - {QKeySequence::Cut, 0, Qt::SHIFT | Qt::Key_Delete, QGuiApplicationPrivate::KB_Win | QGuiApplicationPrivate::KB_X11}, //## Check if this should work on mac - {QKeySequence::SelectStartOfLine, 0, Qt::SHIFT | Qt::Key_Home, QGuiApplicationPrivate::KB_Win | QGuiApplicationPrivate::KB_X11}, - {QKeySequence::SelectStartOfDocument, 0, Qt::SHIFT | Qt::Key_Home, QGuiApplicationPrivate::KB_Mac}, - {QKeySequence::SelectEndOfLine, 0, Qt::SHIFT | Qt::Key_End, QGuiApplicationPrivate::KB_Win | QGuiApplicationPrivate::KB_X11}, - {QKeySequence::SelectEndOfDocument, 0, Qt::SHIFT | Qt::Key_End, QGuiApplicationPrivate::KB_Mac}, - {QKeySequence::SelectPreviousChar, 0, Qt::SHIFT | Qt::Key_Left, QGuiApplicationPrivate::KB_All}, - {QKeySequence::SelectPreviousLine, 0, Qt::SHIFT | Qt::Key_Up, QGuiApplicationPrivate::KB_All}, - {QKeySequence::SelectNextChar, 0, Qt::SHIFT | Qt::Key_Right, QGuiApplicationPrivate::KB_All}, - {QKeySequence::SelectNextLine, 0, Qt::SHIFT | Qt::Key_Down, QGuiApplicationPrivate::KB_All}, - {QKeySequence::SelectPreviousPage, 0, Qt::SHIFT | Qt::Key_PageUp, QGuiApplicationPrivate::KB_All}, - {QKeySequence::SelectNextPage, 0, Qt::SHIFT | Qt::Key_PageDown, QGuiApplicationPrivate::KB_All}, - {QKeySequence::WhatsThis, 1, Qt::SHIFT | Qt::Key_F1, QGuiApplicationPrivate::KB_All}, - {QKeySequence::FindPrevious, 0, Qt::SHIFT | Qt::Key_F3, QGuiApplicationPrivate::KB_X11}, - {QKeySequence::FindPrevious, 1, Qt::SHIFT | Qt::Key_F3, QGuiApplicationPrivate::KB_Win}, - {QKeySequence::ZoomIn, 1, Qt::CTRL | Qt::Key_Plus, QGuiApplicationPrivate::KB_All}, - {QKeySequence::NextChild, 0, Qt::CTRL | Qt::Key_Comma, QGuiApplicationPrivate::KB_KDE}, - {QKeySequence::Preferences, 0, Qt::CTRL | Qt::Key_Comma, QGuiApplicationPrivate::KB_Mac}, - {QKeySequence::ZoomOut, 1, Qt::CTRL | Qt::Key_Minus, QGuiApplicationPrivate::KB_All}, - {QKeySequence::PreviousChild, 0, Qt::CTRL | Qt::Key_Period, QGuiApplicationPrivate::KB_KDE}, - {QKeySequence::HelpContents, 1, Qt::CTRL | Qt::Key_Question, QGuiApplicationPrivate::KB_Mac}, - {QKeySequence::SelectAll, 1, Qt::CTRL | Qt::Key_A, QGuiApplicationPrivate::KB_All}, - {QKeySequence::Bold, 1, Qt::CTRL | Qt::Key_B, QGuiApplicationPrivate::KB_All}, - {QKeySequence::Copy, 1, Qt::CTRL | Qt::Key_C, QGuiApplicationPrivate::KB_All}, - {QKeySequence::Delete, 0, Qt::CTRL | Qt::Key_D, QGuiApplicationPrivate::KB_X11}, //emacs (line edit only) - {QKeySequence::Find, 0, Qt::CTRL | Qt::Key_F, QGuiApplicationPrivate::KB_All}, - {QKeySequence::FindNext, 1, Qt::CTRL | Qt::Key_G, QGuiApplicationPrivate::KB_Gnome | QGuiApplicationPrivate::KB_Mac}, - {QKeySequence::FindNext, 0, Qt::CTRL | Qt::Key_G, QGuiApplicationPrivate::KB_Win}, - {QKeySequence::Replace, 0, Qt::CTRL | Qt::Key_H, QGuiApplicationPrivate::KB_Win}, - {QKeySequence::Replace, 0, Qt::CTRL | Qt::Key_H, QGuiApplicationPrivate::KB_Gnome}, - {QKeySequence::Italic, 0, Qt::CTRL | Qt::Key_I, QGuiApplicationPrivate::KB_All}, - {QKeySequence::DeleteEndOfLine, 0, Qt::CTRL | Qt::Key_K, QGuiApplicationPrivate::KB_X11}, //emacs (line edit only) - {QKeySequence::New, 1, Qt::CTRL | Qt::Key_N, QGuiApplicationPrivate::KB_All}, - {QKeySequence::Open, 1, Qt::CTRL | Qt::Key_O, QGuiApplicationPrivate::KB_All}, - {QKeySequence::Print, 1, Qt::CTRL | Qt::Key_P, QGuiApplicationPrivate::KB_All}, - {QKeySequence::Quit, 0, Qt::CTRL | Qt::Key_Q, QGuiApplicationPrivate::KB_Gnome | QGuiApplicationPrivate::KB_KDE | QGuiApplicationPrivate::KB_Mac}, - {QKeySequence::Refresh, 1, Qt::CTRL | Qt::Key_R, QGuiApplicationPrivate::KB_Gnome | QGuiApplicationPrivate::KB_Mac}, - {QKeySequence::Replace, 0, Qt::CTRL | Qt::Key_R, QGuiApplicationPrivate::KB_KDE}, - {QKeySequence::Save, 1, Qt::CTRL | Qt::Key_S, QGuiApplicationPrivate::KB_All}, - {QKeySequence::AddTab, 0, Qt::CTRL | Qt::Key_T, QGuiApplicationPrivate::KB_All}, - {QKeySequence::Underline, 1, Qt::CTRL | Qt::Key_U, QGuiApplicationPrivate::KB_All}, - {QKeySequence::Paste, 1, Qt::CTRL | Qt::Key_V, QGuiApplicationPrivate::KB_All}, - {QKeySequence::Close, 0, Qt::CTRL | Qt::Key_W, QGuiApplicationPrivate::KB_Win | QGuiApplicationPrivate::KB_X11}, - {QKeySequence::Close, 1, Qt::CTRL | Qt::Key_W, QGuiApplicationPrivate::KB_Mac}, - {QKeySequence::Cut, 1, Qt::CTRL | Qt::Key_X, QGuiApplicationPrivate::KB_All}, - {QKeySequence::Redo, 1, Qt::CTRL | Qt::Key_Y, QGuiApplicationPrivate::KB_Win}, - {QKeySequence::Undo, 1, Qt::CTRL | Qt::Key_Z, QGuiApplicationPrivate::KB_All}, - {QKeySequence::Back, 1, Qt::CTRL | Qt::Key_BracketLeft, QGuiApplicationPrivate::KB_Mac}, - {QKeySequence::Forward, 1, Qt::CTRL | Qt::Key_BracketRight, QGuiApplicationPrivate::KB_Mac}, - {QKeySequence::PreviousChild, 1, Qt::CTRL | Qt::Key_BraceLeft, QGuiApplicationPrivate::KB_Mac}, - {QKeySequence::NextChild, 1, Qt::CTRL | Qt::Key_BraceRight, QGuiApplicationPrivate::KB_Mac}, - {QKeySequence::NextChild, 1, Qt::CTRL | Qt::Key_Tab, QGuiApplicationPrivate::KB_Win | QGuiApplicationPrivate::KB_X11}, - {QKeySequence::NextChild, 0, Qt::CTRL | Qt::Key_Tab, QGuiApplicationPrivate::KB_Mac}, //different priority from above - {QKeySequence::DeleteStartOfWord, 0, Qt::CTRL | Qt::Key_Backspace, QGuiApplicationPrivate::KB_X11 | QGuiApplicationPrivate::KB_Win}, - {QKeySequence::Copy, 0, Qt::CTRL | Qt::Key_Insert, QGuiApplicationPrivate::KB_X11 | QGuiApplicationPrivate::KB_Win}, - {QKeySequence::DeleteEndOfWord, 0, Qt::CTRL | Qt::Key_Delete, QGuiApplicationPrivate::KB_X11 | QGuiApplicationPrivate::KB_Win}, - {QKeySequence::MoveToStartOfDocument, 0, Qt::CTRL | Qt::Key_Home, QGuiApplicationPrivate::KB_Win | QGuiApplicationPrivate::KB_X11}, - {QKeySequence::MoveToEndOfDocument, 0, Qt::CTRL | Qt::Key_End, QGuiApplicationPrivate::KB_Win | QGuiApplicationPrivate::KB_X11}, - {QKeySequence::Back, 0, Qt::CTRL | Qt::Key_Left, QGuiApplicationPrivate::KB_Mac}, - {QKeySequence::MoveToPreviousWord, 0, Qt::CTRL | Qt::Key_Left, QGuiApplicationPrivate::KB_Win | QGuiApplicationPrivate::KB_X11}, - {QKeySequence::MoveToStartOfLine, 0, Qt::CTRL | Qt::Key_Left, QGuiApplicationPrivate::KB_Mac }, - {QKeySequence::MoveToStartOfDocument, 1, Qt::CTRL | Qt::Key_Up, QGuiApplicationPrivate::KB_Mac}, - {QKeySequence::Forward, 0, Qt::CTRL | Qt::Key_Right, QGuiApplicationPrivate::KB_Mac}, - {QKeySequence::MoveToEndOfLine, 0, Qt::CTRL | Qt::Key_Right, QGuiApplicationPrivate::KB_Mac }, - {QKeySequence::MoveToNextWord, 0, Qt::CTRL | Qt::Key_Right, QGuiApplicationPrivate::KB_Win | QGuiApplicationPrivate::KB_X11}, - {QKeySequence::MoveToEndOfDocument, 1, Qt::CTRL | Qt::Key_Down, QGuiApplicationPrivate::KB_Mac}, - {QKeySequence::Close, 1, Qt::CTRL | Qt::Key_F4, QGuiApplicationPrivate::KB_Win}, - {QKeySequence::Close, 0, Qt::CTRL | Qt::Key_F4, QGuiApplicationPrivate::KB_Mac}, - {QKeySequence::NextChild, 0, Qt::CTRL | Qt::Key_F6, QGuiApplicationPrivate::KB_Win}, - {QKeySequence::FindPrevious, 1, Qt::CTRL | Qt::SHIFT | Qt::Key_G, QGuiApplicationPrivate::KB_Gnome | QGuiApplicationPrivate::KB_Mac}, - {QKeySequence::FindPrevious, 0, Qt::CTRL | Qt::SHIFT | Qt::Key_G, QGuiApplicationPrivate::KB_Win}, - {QKeySequence::AddTab, 1, Qt::CTRL | Qt::SHIFT | Qt::Key_N, QGuiApplicationPrivate::KB_KDE}, - {QKeySequence::SaveAs, 0, Qt::CTRL | Qt::SHIFT | Qt::Key_S, QGuiApplicationPrivate::KB_Gnome | QGuiApplicationPrivate::KB_Mac}, - {QKeySequence::Redo, 0, Qt::CTRL | Qt::SHIFT | Qt::Key_Z, QGuiApplicationPrivate::KB_Win | QGuiApplicationPrivate::KB_X11}, - {QKeySequence::Redo, 0, Qt::CTRL | Qt::SHIFT | Qt::Key_Z, QGuiApplicationPrivate::KB_Mac}, - {QKeySequence::PreviousChild, 1, Qt::CTRL | Qt::SHIFT | Qt::Key_Backtab, QGuiApplicationPrivate::KB_Win | QGuiApplicationPrivate::KB_X11}, - {QKeySequence::PreviousChild, 0, Qt::CTRL | Qt::SHIFT | Qt::Key_Backtab, QGuiApplicationPrivate::KB_Mac },//different priority from above - {QKeySequence::Paste, 0, Qt::CTRL | Qt::SHIFT | Qt::Key_Insert, QGuiApplicationPrivate::KB_X11}, - {QKeySequence::SelectStartOfDocument, 0, Qt::CTRL | Qt::SHIFT | Qt::Key_Home, QGuiApplicationPrivate::KB_Win | QGuiApplicationPrivate::KB_X11}, - {QKeySequence::SelectEndOfDocument, 0, Qt::CTRL | Qt::SHIFT | Qt::Key_End, QGuiApplicationPrivate::KB_Win | QGuiApplicationPrivate::KB_X11}, - {QKeySequence::SelectPreviousWord, 0, Qt::CTRL | Qt::SHIFT | Qt::Key_Left, QGuiApplicationPrivate::KB_Win | QGuiApplicationPrivate::KB_X11}, - {QKeySequence::SelectStartOfLine, 1, Qt::CTRL | Qt::SHIFT | Qt::Key_Left, QGuiApplicationPrivate::KB_Mac }, - {QKeySequence::SelectStartOfDocument, 1, Qt::CTRL | Qt::SHIFT | Qt::Key_Up, QGuiApplicationPrivate::KB_Mac}, - {QKeySequence::SelectNextWord, 0, Qt::CTRL | Qt::SHIFT | Qt::Key_Right, QGuiApplicationPrivate::KB_Win | QGuiApplicationPrivate::KB_X11}, - {QKeySequence::SelectEndOfLine, 1, Qt::CTRL | Qt::SHIFT | Qt::Key_Right, QGuiApplicationPrivate::KB_Mac }, - {QKeySequence::SelectEndOfDocument, 1, Qt::CTRL | Qt::SHIFT | Qt::Key_Down, QGuiApplicationPrivate::KB_Mac}, - {QKeySequence::PreviousChild, 0, Qt::CTRL | Qt::SHIFT | Qt::Key_F6, QGuiApplicationPrivate::KB_Win}, - {QKeySequence::Undo, 0, Qt::ALT | Qt::Key_Backspace, QGuiApplicationPrivate::KB_Win}, - {QKeySequence::DeleteStartOfWord, 0, Qt::ALT | Qt::Key_Backspace, QGuiApplicationPrivate::KB_Mac}, - {QKeySequence::DeleteEndOfWord, 0, Qt::ALT | Qt::Key_Delete, QGuiApplicationPrivate::KB_Mac}, - {QKeySequence::Back, 1, Qt::ALT | Qt::Key_Left, QGuiApplicationPrivate::KB_Win | QGuiApplicationPrivate::KB_X11}, - {QKeySequence::MoveToPreviousWord, 0, Qt::ALT | Qt::Key_Left, QGuiApplicationPrivate::KB_Mac}, - {QKeySequence::MoveToStartOfBlock, 0, Qt::ALT | Qt::Key_Up, QGuiApplicationPrivate::KB_Mac}, //mac only - {QKeySequence::MoveToNextWord, 0, Qt::ALT | Qt::Key_Right, QGuiApplicationPrivate::KB_Mac}, - {QKeySequence::Forward, 1, Qt::ALT | Qt::Key_Right, QGuiApplicationPrivate::KB_Win | QGuiApplicationPrivate::KB_X11}, - {QKeySequence::MoveToEndOfBlock, 0, Qt::ALT | Qt::Key_Down, QGuiApplicationPrivate::KB_Mac}, //mac only - {QKeySequence::MoveToPreviousPage, 0, Qt::ALT | Qt::Key_PageUp, QGuiApplicationPrivate::KB_Mac }, - {QKeySequence::MoveToNextPage, 0, Qt::ALT | Qt::Key_PageDown, QGuiApplicationPrivate::KB_Mac }, - {QKeySequence::Redo, 0, Qt::ALT | Qt::SHIFT | Qt::Key_Backspace,QGuiApplicationPrivate::KB_Win}, - {QKeySequence::SelectPreviousWord, 0, Qt::ALT | Qt::SHIFT | Qt::Key_Left, QGuiApplicationPrivate::KB_Mac}, - {QKeySequence::SelectStartOfBlock, 0, Qt::ALT | Qt::SHIFT | Qt::Key_Up, QGuiApplicationPrivate::KB_Mac}, //mac only - {QKeySequence::SelectNextWord, 0, Qt::ALT | Qt::SHIFT | Qt::Key_Right, QGuiApplicationPrivate::KB_Mac}, - {QKeySequence::SelectEndOfBlock, 0, Qt::ALT | Qt::SHIFT | Qt::Key_Down, QGuiApplicationPrivate::KB_Mac}, //mac only - {QKeySequence::MoveToStartOfBlock, 0, Qt::META | Qt::Key_A, QGuiApplicationPrivate::KB_Mac}, - {QKeySequence::Delete, 0, Qt::META | Qt::Key_D, QGuiApplicationPrivate::KB_Mac}, - {QKeySequence::MoveToEndOfBlock, 0, Qt::META | Qt::Key_E, QGuiApplicationPrivate::KB_Mac}, - {QKeySequence::InsertLineSeparator, 0, Qt::META | Qt::Key_Return, QGuiApplicationPrivate::KB_Mac}, - {QKeySequence::InsertLineSeparator, 0, Qt::META | Qt::Key_Enter, QGuiApplicationPrivate::KB_Mac}, - {QKeySequence::MoveToStartOfLine, 0, Qt::META | Qt::Key_Left, QGuiApplicationPrivate::KB_Mac}, - {QKeySequence::MoveToPreviousPage, 0, Qt::META | Qt::Key_Up, QGuiApplicationPrivate::KB_Mac}, - {QKeySequence::MoveToEndOfLine, 0, Qt::META | Qt::Key_Right, QGuiApplicationPrivate::KB_Mac}, - {QKeySequence::MoveToNextPage, 0, Qt::META | Qt::Key_Down, QGuiApplicationPrivate::KB_Mac}, - {QKeySequence::MoveToPreviousPage, 0, Qt::META | Qt::Key_PageUp, QGuiApplicationPrivate::KB_Mac}, - {QKeySequence::MoveToNextPage, 0, Qt::META | Qt::Key_PageDown, QGuiApplicationPrivate::KB_Mac}, - {QKeySequence::SelectStartOfBlock, 0, Qt::META | Qt::SHIFT | Qt::Key_A, QGuiApplicationPrivate::KB_Mac}, - {QKeySequence::SelectEndOfBlock, 0, Qt::META | Qt::SHIFT | Qt::Key_E, QGuiApplicationPrivate::KB_Mac}, - {QKeySequence::SelectStartOfLine, 0, Qt::META | Qt::SHIFT | Qt::Key_Left, QGuiApplicationPrivate::KB_Mac}, - {QKeySequence::SelectEndOfLine, 0, Qt::META | Qt::SHIFT | Qt::Key_Right, QGuiApplicationPrivate::KB_Mac} + {QKeySequence::Back, 0, Qt::Key_Backspace, KB_Win}, + {QKeySequence::InsertParagraphSeparator,0, Qt::Key_Return, KB_All}, + {QKeySequence::InsertParagraphSeparator,0, Qt::Key_Enter, KB_All}, + {QKeySequence::Delete, 1, Qt::Key_Delete, KB_All}, + {QKeySequence::MoveToStartOfLine, 0, Qt::Key_Home, KB_Win | KB_X11}, + {QKeySequence::MoveToStartOfDocument, 0, Qt::Key_Home, KB_Mac}, + {QKeySequence::MoveToEndOfLine, 0, Qt::Key_End, KB_Win | KB_X11}, + {QKeySequence::MoveToEndOfDocument, 0, Qt::Key_End, KB_Mac}, + {QKeySequence::MoveToPreviousChar, 0, Qt::Key_Left, KB_All}, + {QKeySequence::MoveToPreviousLine, 0, Qt::Key_Up, KB_All}, + {QKeySequence::MoveToNextChar, 0, Qt::Key_Right, KB_All}, + {QKeySequence::MoveToNextLine, 0, Qt::Key_Down, KB_All}, + {QKeySequence::MoveToPreviousPage, 1, Qt::Key_PageUp, KB_All}, + {QKeySequence::MoveToNextPage, 1, Qt::Key_PageDown, KB_All}, + {QKeySequence::HelpContents, 0, Qt::Key_F1, KB_Win | KB_X11}, + {QKeySequence::FindNext, 0, Qt::Key_F3, KB_X11}, + {QKeySequence::FindNext, 1, Qt::Key_F3, KB_Win}, + {QKeySequence::Refresh, 0, Qt::Key_F5, KB_Win | KB_X11}, + {QKeySequence::Undo, 0, Qt::Key_F14, KB_X11}, //Undo on sun keyboards + {QKeySequence::Copy, 0, Qt::Key_F16, KB_X11}, //Copy on sun keyboards + {QKeySequence::Paste, 0, Qt::Key_F18, KB_X11}, //Paste on sun keyboards + {QKeySequence::Cut, 0, Qt::Key_F20, KB_X11}, //Cut on sun keyboards + {QKeySequence::PreviousChild, 0, Qt::Key_Back, KB_All}, + {QKeySequence::NextChild, 0, Qt::Key_Forward, KB_All}, + {QKeySequence::Forward, 0, Qt::SHIFT | Qt::Key_Backspace, KB_Win}, + {QKeySequence::InsertLineSeparator, 0, Qt::SHIFT | Qt::Key_Return, KB_All}, + {QKeySequence::InsertLineSeparator, 0, Qt::SHIFT | Qt::Key_Enter, KB_All}, + {QKeySequence::Paste, 0, Qt::SHIFT | Qt::Key_Insert, KB_Win | KB_X11}, + {QKeySequence::Cut, 0, Qt::SHIFT | Qt::Key_Delete, KB_Win | KB_X11}, //## Check if this should work on mac + {QKeySequence::SelectStartOfLine, 0, Qt::SHIFT | Qt::Key_Home, KB_Win | KB_X11}, + {QKeySequence::SelectStartOfDocument, 0, Qt::SHIFT | Qt::Key_Home, KB_Mac}, + {QKeySequence::SelectEndOfLine, 0, Qt::SHIFT | Qt::Key_End, KB_Win | KB_X11}, + {QKeySequence::SelectEndOfDocument, 0, Qt::SHIFT | Qt::Key_End, KB_Mac}, + {QKeySequence::SelectPreviousChar, 0, Qt::SHIFT | Qt::Key_Left, KB_All}, + {QKeySequence::SelectPreviousLine, 0, Qt::SHIFT | Qt::Key_Up, KB_All}, + {QKeySequence::SelectNextChar, 0, Qt::SHIFT | Qt::Key_Right, KB_All}, + {QKeySequence::SelectNextLine, 0, Qt::SHIFT | Qt::Key_Down, KB_All}, + {QKeySequence::SelectPreviousPage, 0, Qt::SHIFT | Qt::Key_PageUp, KB_All}, + {QKeySequence::SelectNextPage, 0, Qt::SHIFT | Qt::Key_PageDown, KB_All}, + {QKeySequence::WhatsThis, 1, Qt::SHIFT | Qt::Key_F1, KB_All}, + {QKeySequence::FindPrevious, 0, Qt::SHIFT | Qt::Key_F3, KB_X11}, + {QKeySequence::FindPrevious, 1, Qt::SHIFT | Qt::Key_F3, KB_Win}, + {QKeySequence::ZoomIn, 1, Qt::CTRL | Qt::Key_Plus, KB_All}, + {QKeySequence::NextChild, 0, Qt::CTRL | Qt::Key_Comma, KB_KDE}, + {QKeySequence::Preferences, 0, Qt::CTRL | Qt::Key_Comma, KB_Mac}, + {QKeySequence::ZoomOut, 1, Qt::CTRL | Qt::Key_Minus, KB_All}, + {QKeySequence::PreviousChild, 0, Qt::CTRL | Qt::Key_Period, KB_KDE}, + {QKeySequence::HelpContents, 1, Qt::CTRL | Qt::Key_Question, KB_Mac}, + {QKeySequence::SelectAll, 1, Qt::CTRL | Qt::Key_A, KB_All}, + {QKeySequence::Bold, 1, Qt::CTRL | Qt::Key_B, KB_All}, + {QKeySequence::Copy, 1, Qt::CTRL | Qt::Key_C, KB_All}, + {QKeySequence::Delete, 0, Qt::CTRL | Qt::Key_D, KB_X11}, //emacs (line edit only) + {QKeySequence::Find, 0, Qt::CTRL | Qt::Key_F, KB_All}, + {QKeySequence::FindNext, 1, Qt::CTRL | Qt::Key_G, KB_Gnome | KB_Mac}, + {QKeySequence::FindNext, 0, Qt::CTRL | Qt::Key_G, KB_Win}, + {QKeySequence::Replace, 0, Qt::CTRL | Qt::Key_H, KB_Win}, + {QKeySequence::Replace, 0, Qt::CTRL | Qt::Key_H, KB_Gnome}, + {QKeySequence::Italic, 0, Qt::CTRL | Qt::Key_I, KB_All}, + {QKeySequence::DeleteEndOfLine, 0, Qt::CTRL | Qt::Key_K, KB_X11}, //emacs (line edit only) + {QKeySequence::New, 1, Qt::CTRL | Qt::Key_N, KB_All}, + {QKeySequence::Open, 1, Qt::CTRL | Qt::Key_O, KB_All}, + {QKeySequence::Print, 1, Qt::CTRL | Qt::Key_P, KB_All}, + {QKeySequence::Quit, 0, Qt::CTRL | Qt::Key_Q, KB_Gnome | KB_KDE | KB_Mac}, + {QKeySequence::Refresh, 1, Qt::CTRL | Qt::Key_R, KB_Gnome | KB_Mac}, + {QKeySequence::Replace, 0, Qt::CTRL | Qt::Key_R, KB_KDE}, + {QKeySequence::Save, 1, Qt::CTRL | Qt::Key_S, KB_All}, + {QKeySequence::AddTab, 0, Qt::CTRL | Qt::Key_T, KB_All}, + {QKeySequence::Underline, 1, Qt::CTRL | Qt::Key_U, KB_All}, + {QKeySequence::Paste, 1, Qt::CTRL | Qt::Key_V, KB_All}, + {QKeySequence::Close, 0, Qt::CTRL | Qt::Key_W, KB_Win | KB_X11}, + {QKeySequence::Close, 1, Qt::CTRL | Qt::Key_W, KB_Mac}, + {QKeySequence::Cut, 1, Qt::CTRL | Qt::Key_X, KB_All}, + {QKeySequence::Redo, 1, Qt::CTRL | Qt::Key_Y, KB_Win}, + {QKeySequence::Undo, 1, Qt::CTRL | Qt::Key_Z, KB_All}, + {QKeySequence::Back, 1, Qt::CTRL | Qt::Key_BracketLeft, KB_Mac}, + {QKeySequence::Forward, 1, Qt::CTRL | Qt::Key_BracketRight, KB_Mac}, + {QKeySequence::PreviousChild, 1, Qt::CTRL | Qt::Key_BraceLeft, KB_Mac}, + {QKeySequence::NextChild, 1, Qt::CTRL | Qt::Key_BraceRight, KB_Mac}, + {QKeySequence::NextChild, 1, Qt::CTRL | Qt::Key_Tab, KB_Win | KB_X11}, + {QKeySequence::NextChild, 0, Qt::CTRL | Qt::Key_Tab, KB_Mac}, //different priority from above + {QKeySequence::DeleteStartOfWord, 0, Qt::CTRL | Qt::Key_Backspace, KB_X11 | KB_Win}, + {QKeySequence::Copy, 0, Qt::CTRL | Qt::Key_Insert, KB_X11 | KB_Win}, + {QKeySequence::DeleteEndOfWord, 0, Qt::CTRL | Qt::Key_Delete, KB_X11 | KB_Win}, + {QKeySequence::MoveToStartOfDocument, 0, Qt::CTRL | Qt::Key_Home, KB_Win | KB_X11}, + {QKeySequence::MoveToEndOfDocument, 0, Qt::CTRL | Qt::Key_End, KB_Win | KB_X11}, + {QKeySequence::Back, 0, Qt::CTRL | Qt::Key_Left, KB_Mac}, + {QKeySequence::MoveToPreviousWord, 0, Qt::CTRL | Qt::Key_Left, KB_Win | KB_X11}, + {QKeySequence::MoveToStartOfLine, 0, Qt::CTRL | Qt::Key_Left, KB_Mac }, + {QKeySequence::MoveToStartOfDocument, 1, Qt::CTRL | Qt::Key_Up, KB_Mac}, + {QKeySequence::Forward, 0, Qt::CTRL | Qt::Key_Right, KB_Mac}, + {QKeySequence::MoveToEndOfLine, 0, Qt::CTRL | Qt::Key_Right, KB_Mac }, + {QKeySequence::MoveToNextWord, 0, Qt::CTRL | Qt::Key_Right, KB_Win | KB_X11}, + {QKeySequence::MoveToEndOfDocument, 1, Qt::CTRL | Qt::Key_Down, KB_Mac}, + {QKeySequence::Close, 1, Qt::CTRL | Qt::Key_F4, KB_Win}, + {QKeySequence::Close, 0, Qt::CTRL | Qt::Key_F4, KB_Mac}, + {QKeySequence::NextChild, 0, Qt::CTRL | Qt::Key_F6, KB_Win}, + {QKeySequence::FindPrevious, 1, Qt::CTRL | Qt::SHIFT | Qt::Key_G, KB_Gnome | KB_Mac}, + {QKeySequence::FindPrevious, 0, Qt::CTRL | Qt::SHIFT | Qt::Key_G, KB_Win}, + {QKeySequence::AddTab, 1, Qt::CTRL | Qt::SHIFT | Qt::Key_N, KB_KDE}, + {QKeySequence::SaveAs, 0, Qt::CTRL | Qt::SHIFT | Qt::Key_S, KB_Gnome | KB_Mac}, + {QKeySequence::Redo, 0, Qt::CTRL | Qt::SHIFT | Qt::Key_Z, KB_Win | KB_X11}, + {QKeySequence::Redo, 0, Qt::CTRL | Qt::SHIFT | Qt::Key_Z, KB_Mac}, + {QKeySequence::PreviousChild, 1, Qt::CTRL | Qt::SHIFT | Qt::Key_Backtab, KB_Win | KB_X11}, + {QKeySequence::PreviousChild, 0, Qt::CTRL | Qt::SHIFT | Qt::Key_Backtab, KB_Mac },//different priority from above + {QKeySequence::Paste, 0, Qt::CTRL | Qt::SHIFT | Qt::Key_Insert, KB_X11}, + {QKeySequence::SelectStartOfDocument, 0, Qt::CTRL | Qt::SHIFT | Qt::Key_Home, KB_Win | KB_X11}, + {QKeySequence::SelectEndOfDocument, 0, Qt::CTRL | Qt::SHIFT | Qt::Key_End, KB_Win | KB_X11}, + {QKeySequence::SelectPreviousWord, 0, Qt::CTRL | Qt::SHIFT | Qt::Key_Left, KB_Win | KB_X11}, + {QKeySequence::SelectStartOfLine, 1, Qt::CTRL | Qt::SHIFT | Qt::Key_Left, KB_Mac }, + {QKeySequence::SelectStartOfDocument, 1, Qt::CTRL | Qt::SHIFT | Qt::Key_Up, KB_Mac}, + {QKeySequence::SelectNextWord, 0, Qt::CTRL | Qt::SHIFT | Qt::Key_Right, KB_Win | KB_X11}, + {QKeySequence::SelectEndOfLine, 1, Qt::CTRL | Qt::SHIFT | Qt::Key_Right, KB_Mac }, + {QKeySequence::SelectEndOfDocument, 1, Qt::CTRL | Qt::SHIFT | Qt::Key_Down, KB_Mac}, + {QKeySequence::PreviousChild, 0, Qt::CTRL | Qt::SHIFT | Qt::Key_F6, KB_Win}, + {QKeySequence::Undo, 0, Qt::ALT | Qt::Key_Backspace, KB_Win}, + {QKeySequence::DeleteStartOfWord, 0, Qt::ALT | Qt::Key_Backspace, KB_Mac}, + {QKeySequence::DeleteEndOfWord, 0, Qt::ALT | Qt::Key_Delete, KB_Mac}, + {QKeySequence::Back, 1, Qt::ALT | Qt::Key_Left, KB_Win | KB_X11}, + {QKeySequence::MoveToPreviousWord, 0, Qt::ALT | Qt::Key_Left, KB_Mac}, + {QKeySequence::MoveToStartOfBlock, 0, Qt::ALT | Qt::Key_Up, KB_Mac}, //mac only + {QKeySequence::MoveToNextWord, 0, Qt::ALT | Qt::Key_Right, KB_Mac}, + {QKeySequence::Forward, 1, Qt::ALT | Qt::Key_Right, KB_Win | KB_X11}, + {QKeySequence::MoveToEndOfBlock, 0, Qt::ALT | Qt::Key_Down, KB_Mac}, //mac only + {QKeySequence::MoveToPreviousPage, 0, Qt::ALT | Qt::Key_PageUp, KB_Mac }, + {QKeySequence::MoveToNextPage, 0, Qt::ALT | Qt::Key_PageDown, KB_Mac }, + {QKeySequence::Redo, 0, Qt::ALT | Qt::SHIFT | Qt::Key_Backspace,KB_Win}, + {QKeySequence::SelectPreviousWord, 0, Qt::ALT | Qt::SHIFT | Qt::Key_Left, KB_Mac}, + {QKeySequence::SelectStartOfBlock, 0, Qt::ALT | Qt::SHIFT | Qt::Key_Up, KB_Mac}, //mac only + {QKeySequence::SelectNextWord, 0, Qt::ALT | Qt::SHIFT | Qt::Key_Right, KB_Mac}, + {QKeySequence::SelectEndOfBlock, 0, Qt::ALT | Qt::SHIFT | Qt::Key_Down, KB_Mac}, //mac only + {QKeySequence::MoveToStartOfBlock, 0, Qt::META | Qt::Key_A, KB_Mac}, + {QKeySequence::Delete, 0, Qt::META | Qt::Key_D, KB_Mac}, + {QKeySequence::MoveToEndOfBlock, 0, Qt::META | Qt::Key_E, KB_Mac}, + {QKeySequence::InsertLineSeparator, 0, Qt::META | Qt::Key_Return, KB_Mac}, + {QKeySequence::InsertLineSeparator, 0, Qt::META | Qt::Key_Enter, KB_Mac}, + {QKeySequence::MoveToStartOfLine, 0, Qt::META | Qt::Key_Left, KB_Mac}, + {QKeySequence::MoveToPreviousPage, 0, Qt::META | Qt::Key_Up, KB_Mac}, + {QKeySequence::MoveToEndOfLine, 0, Qt::META | Qt::Key_Right, KB_Mac}, + {QKeySequence::MoveToNextPage, 0, Qt::META | Qt::Key_Down, KB_Mac}, + {QKeySequence::MoveToPreviousPage, 0, Qt::META | Qt::Key_PageUp, KB_Mac}, + {QKeySequence::MoveToNextPage, 0, Qt::META | Qt::Key_PageDown, KB_Mac}, + {QKeySequence::SelectStartOfBlock, 0, Qt::META | Qt::SHIFT | Qt::Key_A, KB_Mac}, + {QKeySequence::SelectEndOfBlock, 0, Qt::META | Qt::SHIFT | Qt::Key_E, KB_Mac}, + {QKeySequence::SelectStartOfLine, 0, Qt::META | Qt::SHIFT | Qt::Key_Left, KB_Mac}, + {QKeySequence::SelectEndOfLine, 0, Qt::META | Qt::SHIFT | Qt::Key_Right, KB_Mac} }; const uint QKeySequencePrivate::numberOfKeyBindings = sizeof(QKeySequencePrivate::keyBindings)/(sizeof(QKeyBinding)); @@ -991,7 +1002,7 @@ static inline int maybeSwapShortcut(int shortcut) */ QList<QKeySequence> QKeySequence::keyBindings(StandardKey key) { - uint platform = QGuiApplicationPrivate::currentKeyPlatform(); + const uint platform = QKeySequencePrivate::currentKeyPlatforms(); QList <QKeySequence> list; for (uint i = 0; i < QKeySequencePrivate::numberOfKeyBindings ; ++i) { QKeyBinding keyBinding = QKeySequencePrivate::keyBindings[i]; @@ -1330,6 +1341,19 @@ int QKeySequencePrivate::decodeString(const QString &str, QKeySequence::Sequence return ret; } +unsigned QKeySequencePrivate::currentKeyPlatforms() +{ + int keyboardScheme = QPlatformTheme::WindowsKeyboardScheme; + if (const QPlatformTheme *theme = QGuiApplicationPrivate::platformTheme()) + keyboardScheme = theme->themeHint(QPlatformTheme::KeyboardScheme).toInt(); + unsigned result = 1u << keyboardScheme; + if (keyboardScheme == QPlatformTheme::KdeKeyboardScheme + || keyboardScheme == QPlatformTheme::GnomeKeyboardScheme + || keyboardScheme == QPlatformTheme::CdeKeyboardScheme) + result |= KB_X11; + return result; +} + /*! Creates a shortcut string for \a key. For example, Qt::CTRL+Qt::Key_O gives "Ctrl+O". The strings, "Ctrl", "Shift", etc. are @@ -1711,14 +1735,8 @@ QDataStream &operator>>(QDataStream &s, QKeySequence &keysequence) #ifndef QT_NO_DEBUG_STREAM QDebug operator<<(QDebug dbg, const QKeySequence &p) { -#ifndef Q_BROKEN_DEBUG_STREAM dbg.nospace() << "QKeySequence(" << p.toString() << ')'; return dbg.space(); -#else - qWarning("This compiler doesn't support streaming QKeySequence to QDebug"); - return dbg; - Q_UNUSED(p); -#endif } #endif diff --git a/src/gui/kernel/qkeysequence_p.h b/src/gui/kernel/qkeysequence_p.h index 68cbb8778b..4481557121 100644 --- a/src/gui/kernel/qkeysequence_p.h +++ b/src/gui/kernel/qkeysequence_p.h @@ -88,6 +88,7 @@ public: static const QKeyBinding keyBindings[]; static const uint numberOfKeyBindings; + static unsigned currentKeyPlatforms(); }; #endif // QT_NO_SHORTCUT diff --git a/src/gui/kernel/qopenglcontext.cpp b/src/gui/kernel/qopenglcontext.cpp index ba51653fcf..f9ebf8820c 100644 --- a/src/gui/kernel/qopenglcontext.cpp +++ b/src/gui/kernel/qopenglcontext.cpp @@ -74,6 +74,76 @@ QHash<QOpenGLContext *, bool> QOpenGLContextPrivate::makeCurrentTracker; QMutex QOpenGLContextPrivate::makeCurrentTrackerMutex; #endif +/*! + \class QOpenGLContext + \brief The QOpenGLContext represents a native OpenGL context, enabling + OpenGL rendering on a QSurface. + + QOpenGLContext represents the OpenGL state of an underlying OpenGL context. + To set up a context, set its screen and format such that they match those + of the surface or surfaces with which the context is meant to be used, if + necessary make it share resources with other contexts with + setShareContext(), and finally call create(). Use isValid() to check if the + context was successfully initialized. + + A context can be made current against a given surface by calling + makeCurrent(). When OpenGL rendering is done, call swapBuffers() to swap + the front and back buffers of the surface, so that the newly rendered + content becomes visible. To be able to support certain platforms, + QOpenGLContext requires that you call makeCurrent() again before starting + rendering a new frame, after calling swapBuffers(). + + If the context is temporarily not needed, such as when the application is + not rendering, it can be useful to call destroy() to free resources. + However, if you do so you will need to call create() again before the + context can be used, and you might need to recreate any OpenGL resources + and reinitialize the OpenGL state. You can connect to the + aboutToBeDestroyed() signal to clean up any resources that have been + allocated with different ownership from the QOpenGLContext itself. + + Once a QOpenGLContext has been made current, you can render to it in a + platform independent way by using Qt's OpenGL enablers such as + QOpenGLFunctions, QOpenGLBuffer, QOpenGLShaderProgram, and + QOpenGLFramebufferObject. It is also possible to use the platform's OpenGL + API directly, without using the Qt enablers, although potentially at the + cost of portability. The latter is necessary when wanting to use OpenGL 1.x + or OpenGL ES 1.x. + + For more information about the OpenGL API, refer to the official + \l{OpenGL documentation}. + + \section1 Thread affinity + + QOpenGLContext can be moved to a different thread with moveToThread(). Do + not call makeCurrent() from a different thread than the one to which the + QOpenGLContext object belongs. A context can only be current in one thread + and against one surface at a time, and a thread only has one context + current at a time. + + \section1 Context resource sharing + + Resources, such as framebuffer objects, textures, and vertex buffer objects + can be shared between contexts. Use setShareContext() before calling + create() to specify that the contexts should share these resources. + QOpenGLContext internally keeps track of a QOpenGLContextGroup object which + can be accessed with shareGroup(), and which can be used to find all the + contexts in a given share group. A share group consists of all contexts that + have been succesfully initialized and are sharing with an existing context in + the share group. A non-sharing context has a share group consisting of a + single context. + + \section1 Default framebuffer + + On certain platforms, a framebuffer other than 0 might be the default frame + buffer depending on the current surface. Instead of calling + glBindFramebuffer(0), it is recommended that you use + glBindFramebuffer(ctx->defaultFramebufferObject()), to ensure that your + application is portable between different platforms. However, if you use + QOpenGLFunctions::glBindFramebuffer(), this is done automatically for you. + + \sa QOpenGLFunctions, QOpenGLBuffer, QOpenGLShaderProgram, QOpenGLFramebufferObject +*/ + void QOpenGLContextPrivate::setCurrentContext(QOpenGLContext *context) { QGuiGLThreadContext *threadContext = qwindow_context_storage.localData(); @@ -89,7 +159,8 @@ void QOpenGLContextPrivate::setCurrentContext(QOpenGLContext *context) } /*! - Returns the last context which called makeCurrent. This function is thread aware. + Returns the last context which called makeCurrent in the current thread, + or 0, if no context is current. */ QOpenGLContext* QOpenGLContext::currentContext() { @@ -100,17 +171,31 @@ QOpenGLContext* QOpenGLContext::currentContext() return 0; } +/*! + Returns true if the two contexts are sharing OpenGL resources. +*/ bool QOpenGLContext::areSharing(QOpenGLContext *first, QOpenGLContext *second) { return first->shareGroup() == second->shareGroup(); } +/*! + Returns the underlying platform context. + + \internal +*/ QPlatformOpenGLContext *QOpenGLContext::handle() const { Q_D(const QOpenGLContext); return d->platformGLContext; } +/*! + Returns the underlying platform context with which this context is sharing. + + \internal +*/ + QPlatformOpenGLContext *QOpenGLContext::shareHandle() const { Q_D(const QOpenGLContext); @@ -120,7 +205,11 @@ QPlatformOpenGLContext *QOpenGLContext::shareHandle() const } /*! - Creates a new GL context instance, you need to call create() before it can be used. + Creates a new OpenGL context instance. + + Before it can be used you need to set the proper format and call create(). + + \sa create(), makeCurrent() */ QOpenGLContext::QOpenGLContext(QObject *parent) : QObject(*new QOpenGLContextPrivate(), parent) @@ -130,7 +219,8 @@ QOpenGLContext::QOpenGLContext(QObject *parent) } /*! - Sets the format the GL context should be compatible with. You need to call create() before it takes effect. + Sets the \a format the OpenGL context should be compatible with. You need + to call create() before it takes effect. */ void QOpenGLContext::setFormat(const QSurfaceFormat &format) { @@ -139,7 +229,8 @@ void QOpenGLContext::setFormat(const QSurfaceFormat &format) } /*! - Sets the context to share textures, shaders, and other GL resources with. You need to call create() before it takes effect. + Sets the context to share textures, shaders, and other OpenGL resources + with. You need to call create() before it takes effect. */ void QOpenGLContext::setShareContext(QOpenGLContext *shareContext) { @@ -148,7 +239,8 @@ void QOpenGLContext::setShareContext(QOpenGLContext *shareContext) } /*! - Sets the screen the GL context should be valid for. You need to call create() before it takes effect. + Sets the \a screen the OpenGL context should be valid for. You need to call + create() before it takes effect. */ void QOpenGLContext::setScreen(QScreen *screen) { @@ -159,9 +251,15 @@ void QOpenGLContext::setScreen(QScreen *screen) } /*! - Attempts to create the GL context with the desired parameters. + Attempts to create the OpenGL context with the current configuration. + + The current configuration includes the format, the share context, and the + screen. - Returns true if the native context was successfully created and is ready to be used. + Returns true if the native context was successfully created and is ready to + be used with makeCurrent(), swapBuffers(), etc. + + \sa makeCurrent(), destroy() */ bool QOpenGLContext::create() { @@ -179,6 +277,22 @@ bool QOpenGLContext::create() return d->platformGLContext; } +/*! + Destroy the underlying platform context associated with this context. + + If any other context is directly or indirectly sharing resources with this + context, the shared resources, which includes vertex buffer objects, shader + objects, textures, and framebuffer objects, are not freed. However, + destroying the underlying platform context frees any state associated with + the context. + + After destroy() has been called, you must call create() if you wish to + use the context again. + + \note This implicitly calls doneCurrent() if the context is current. + + \sa create() +*/ void QOpenGLContext::destroy() { Q_D(QOpenGLContext); @@ -199,15 +313,20 @@ void QOpenGLContext::destroy() \fn void QOpenGLContext::aboutToBeDestroyed() This signal is emitted before the underlying native OpenGL context is - destroyed, such that users may clean up OpenGL resources that might otherwise - be left dangling in the case of shared OpenGL contexts. + destroyed, such that users may clean up OpenGL resources that might + otherwise be left dangling in the case of shared OpenGL contexts. - If you wish to make the context current in order to do clean-up, make sure to - only connect to the signal using a direct connection. + If you wish to make the context current in order to do clean-up, make sure + to only connect to the signal using a direct connection. */ /*! - If this is the current context for the thread, doneCurrent is called + Destroys the QOpenGLContext object. + + This implicitly calls destroy(), so if this is the current context for the + thread, doneCurrent() is also called. + + \sa destroy() */ QOpenGLContext::~QOpenGLContext() { @@ -219,7 +338,9 @@ QOpenGLContext::~QOpenGLContext() } /*! - Returns if this context is valid, i.e. has been successfully created. + Returns if this context is valid, i.e. has been successfully created. + + \sa create() */ bool QOpenGLContext::isValid() const { @@ -228,11 +349,13 @@ bool QOpenGLContext::isValid() const } /*! - Get the QOpenGLFunctions instance for this context. + Get the QOpenGLFunctions instance for this context. - The context or a sharing context must be current. -*/ + QOpenGLContext offers this as a convenient way to access QOpenGLFunctions + without having to manage it manually. + The context or a sharing context must be current. +*/ QOpenGLFunctions *QOpenGLContext::functions() const { Q_D(const QOpenGLContext); @@ -242,15 +365,17 @@ QOpenGLFunctions *QOpenGLContext::functions() const } /*! - Call this to get the default framebuffer object for the current surface. + Call this to get the default framebuffer object for the current surface. - On some platforms the default framebuffer object depends on the surface being rendered to, - and might be different from 0. Thus, instead of calling glBindFramebuffer(0), you should - call glBindFramebuffer(ctx->defaultFramebufferObject()) if you want your application to - work across different Qt platforms. + On some platforms the default framebuffer object depends on the surface + being rendered to, and might be different from 0. Thus, instead of calling + glBindFramebuffer(0), you should call + glBindFramebuffer(ctx->defaultFramebufferObject()) if you want your + application to work across different Qt platforms. - If you use the glBindFramebuffer() in QOpenGLFunctions you do not have to worry about this, - as it automatically binds the current context's defaultFramebufferObject() when 0 is passed. + If you use the glBindFramebuffer() in QOpenGLFunctions you do not have to + worry about this, as it automatically binds the current context's + defaultFramebufferObject() when 0 is passed. */ GLuint QOpenGLContext::defaultFramebufferObject() const { @@ -265,12 +390,18 @@ GLuint QOpenGLContext::defaultFramebufferObject() const } /*! - If surface is 0 this is equivalent to calling doneCurrent(). + Makes the context current in the current thread, against the given + \a surface. + + If \a surface is 0 this is equivalent to calling doneCurrent(). - Do not call this function from a different thread than the one the QOpenGLContext instance lives in. If - you wish to use QOpenGLContext from a different thread you should first call make sure it's not current - in the current thread, by calling doneCurrent() if necessary. Then call moveToThread(otherThread) - before using it in the other thread. + Do not call this function from a different thread than the one the + QOpenGLContext instance lives in. If you wish to use QOpenGLContext from a + different thread you should first call make sure it's not current in the + current thread, by calling doneCurrent() if necessary. Then call + moveToThread(otherThread) before using it in the other thread. + + \sa functions(), doneCurrent() */ bool QOpenGLContext::makeCurrent(QSurface *surface) { @@ -313,6 +444,10 @@ bool QOpenGLContext::makeCurrent(QSurface *surface) /*! Convenience function for calling makeCurrent with a 0 surface. + + This results in no context being current in the current thread. + + \sa makeCurrent(), currentContext() */ void QOpenGLContext::doneCurrent() { @@ -330,7 +465,9 @@ void QOpenGLContext::doneCurrent() } /*! - Returns the surface the context is current for. + Returns the surface the context has been made current with. + + This is the surface passed as an argument to makeCurrent(). */ QSurface *QOpenGLContext::surface() const { @@ -391,6 +528,11 @@ void QOpenGLContext::swapBuffers(QSurface *surface) d->platformGLContext->swapBuffers(surfaceHandle); } +/*! + Resolves the function pointer to an OpenGL extension function, identified by \a procName + + Returns 0 if no such function can be found. +*/ QFunctionPointer QOpenGLContext::getProcAddress(const QByteArray &procName) { Q_D(QOpenGLContext); @@ -399,6 +541,11 @@ QFunctionPointer QOpenGLContext::getProcAddress(const QByteArray &procName) return d->platformGLContext->getProcAddress(procName); } +/*! + Returns the format of the underlying platform context, if create() has been called. + + Otherwise, returns the requested format. +*/ QSurfaceFormat QOpenGLContext::format() const { Q_D(const QOpenGLContext); @@ -407,27 +554,41 @@ QSurfaceFormat QOpenGLContext::format() const return d->platformGLContext->format(); } +/*! + Returns the share group this context belongs to. +*/ QOpenGLContextGroup *QOpenGLContext::shareGroup() const { Q_D(const QOpenGLContext); return d->shareGroup; } +/*! + Returns the share context this context was created with. + + If the underlying platform was not able to support the requested + sharing, this will return 0. +*/ QOpenGLContext *QOpenGLContext::shareContext() const { Q_D(const QOpenGLContext); return d->shareContext; } +/*! + Returns the screen the context was created for. +*/ QScreen *QOpenGLContext::screen() const { Q_D(const QOpenGLContext); return d->screen; } -/* - internal: Needs to have a pointer to qGLContext. But since this is in QtGui we cant - have any type information. +/*! + internal: Needs to have a pointer to qGLContext. But since this is in QtGui we cant + have any type information. + + \internal */ void *QOpenGLContext::qGLContextHandle() const { @@ -435,6 +596,9 @@ void *QOpenGLContext::qGLContextHandle() const return d->qGLContextHandle; } +/*! + \internal +*/ void QOpenGLContext::setQGLContextHandle(void *handle,void (*qGLContextDeleteFunction)(void *)) { Q_D(QOpenGLContext); @@ -442,6 +606,9 @@ void QOpenGLContext::setQGLContextHandle(void *handle,void (*qGLContextDeleteFun d->qGLContextDeleteFunction = qGLContextDeleteFunction; } +/*! + \internal +*/ void QOpenGLContext::deleteQGLContext() { Q_D(QOpenGLContext); @@ -452,23 +619,45 @@ void QOpenGLContext::deleteQGLContext() } } +/*! + \class QOpenGLContextGroup + \brief The QOpenGLContextGroup represents a group of contexts sharing + OpenGL resources. + + QOpenGLContextGroup is automatically created and managed by QOpenGLContext + instances. Its purpose is to identify all the contexts that are sharing + resources. + + \sa QOpenGLContext::shareGroup() +*/ QOpenGLContextGroup::QOpenGLContextGroup() : QObject(*new QOpenGLContextGroupPrivate()) { } +/*! + \internal +*/ QOpenGLContextGroup::~QOpenGLContextGroup() { Q_D(QOpenGLContextGroup); d->cleanup(); } +/*! + Returns all the QOpenGLContext objects in this share group. +*/ QList<QOpenGLContext *> QOpenGLContextGroup::shares() const { Q_D(const QOpenGLContextGroup); return d->m_shares; } +/*! + Returns the QOpenGLContextGroup corresponding to the current context. + + \sa QOpenGLContext::currentContext() +*/ QOpenGLContextGroup *QOpenGLContextGroup::currentContextGroup() { QOpenGLContext *current = QOpenGLContext::currentContext(); @@ -544,9 +733,10 @@ void QOpenGLContextGroupPrivate::deletePendingResources(QOpenGLContext *ctx) \class QOpenGLSharedResource \internal \since 5.0 - \brief The QOpenGLSharedResource class is used to keep track of resources that - are shared between OpenGL contexts (like textures, framebuffer objects, shader - programs, etc), and clean them up in a safe way when they're no longer needed. + \brief The QOpenGLSharedResource class is used to keep track of resources + that are shared between OpenGL contexts (like textures, framebuffer + objects, shader programs, etc), and clean them up in a safe way when + they're no longer needed. The QOpenGLSharedResource instance should never be deleted, instead free() should be called when it's no longer needed. Thus it will be put on a queue @@ -556,11 +746,11 @@ void QOpenGLContextGroupPrivate::deletePendingResources(QOpenGLContext *ctx) The sub-class needs to implement two pure virtual functions. The first, freeResource() must be implemented to actually do the freeing, for example call glDeleteTextures() on a texture id. Qt makes sure a valid context in - the resource's share group is current at the time. The other, invalidateResource(), - is called by Qt in the circumstance when the last context in the share group is - destroyed before free() has been called. The implementation of invalidateResource() - should set any identifiers to 0 or set a flag to prevent them from being used - later on. + the resource's share group is current at the time. The other, + invalidateResource(), is called by Qt in the circumstance when the last + context in the share group is destroyed before free() has been called. The + implementation of invalidateResource() should set any identifiers to 0 or + set a flag to prevent them from being used later on. */ QOpenGLSharedResource::QOpenGLSharedResource(QOpenGLContextGroup *group) : m_group(group) @@ -616,9 +806,9 @@ void QOpenGLSharedResourceGuard::freeResource(QOpenGLContext *context) \since 5.0 \brief The QOpenGLMultiGroupSharedResource keeps track of a shared resource that might be needed from multiple contexts, like a glyph cache or gradient - cache. One instance of the object is created for each group when - necessary. The shared resource instance should have a constructor that - takes a QOpenGLContext *. To get an instance for a given context one calls + cache. One instance of the object is created for each group when necessary. + The shared resource instance should have a constructor that takes a + QOpenGLContext *. To get an instance for a given context one calls T *QOpenGLMultiGroupSharedResource::value<T>(context), where T is a sub-class of QOpenGLSharedResource. diff --git a/src/gui/kernel/qplatformclipboard_qpa.cpp b/src/gui/kernel/qplatformclipboard_qpa.cpp index 9e0c60b3f6..bc08a73a7f 100644 --- a/src/gui/kernel/qplatformclipboard_qpa.cpp +++ b/src/gui/kernel/qplatformclipboard_qpa.cpp @@ -96,6 +96,8 @@ void QPlatformClipboard::setMimeData(QMimeData *data, QClipboard::Mode mode) //we know its clipboard Q_UNUSED(mode); q_clipboardData()->setSource(data); + + emitChanged(mode); } bool QPlatformClipboard::supportsMode(QClipboard::Mode mode) const diff --git a/src/gui/kernel/qplatforminputcontext_qpa.h b/src/gui/kernel/qplatforminputcontext_qpa.h index 77c3811d95..c7d823d662 100644 --- a/src/gui/kernel/qplatforminputcontext_qpa.h +++ b/src/gui/kernel/qplatforminputcontext_qpa.h @@ -64,7 +64,7 @@ public: virtual void reset(); virtual void commit(); virtual void update(Qt::InputMethodQueries); - virtual void invokeAction(QInputPanel::Action, int cursorPosition); + virtual void invokeAction(QInputMethod::Action, int cursorPosition); virtual bool filterEvent(const QEvent *event); virtual QRectF keyboardRect() const; void emitKeyboardRectChanged(); diff --git a/src/gui/kernel/qplatformtheme_qpa.cpp b/src/gui/kernel/qplatformtheme_qpa.cpp index aec465f0ff..3f6b69b902 100644 --- a/src/gui/kernel/qplatformtheme_qpa.cpp +++ b/src/gui/kernel/qplatformtheme_qpa.cpp @@ -84,6 +84,20 @@ QT_BEGIN_NAMESPACE \value StyleNames (QStringList) A list of preferred style names. + \value WindowAutoPlacement (bool) A boolean value indicating whether Windows + (particularly dialogs) are placed by the system + (see _NET_WM_FULL_PLACEMENT in X11). + + \value DialogButtonBoxLayout (int) An integer representing a + QDialogButtonBox::ButtonLayout value. + + \value DialogButtonBoxButtonsHaveIcons (bool) A boolean value indicating whether + the buttons of a QDialogButtonBox should have icons. + + \value UseFullScreenForPopupMenu (bool) Pop menus can cover the full screen including task bar. + + \value KeyboardScheme (int) An integer value (enum KeyboardSchemes) specifying the + keyboard scheme. \sa themeHint(), QStyle::pixelMetric() */ @@ -121,6 +135,14 @@ const QPalette *QPlatformTheme::palette(Palette type) const QVariant QPlatformTheme::themeHint(ThemeHint hint) const { switch (hint) { + case QPlatformTheme::UseFullScreenForPopupMenu: + return QVariant(false); + case QPlatformTheme::WindowAutoPlacement: + return QVariant(false); + case QPlatformTheme::DialogButtonBoxLayout: + return QVariant(int(0)); + case QPlatformTheme::DialogButtonBoxButtonsHaveIcons: + return QVariant(false); case QPlatformTheme::ItemViewActivateItemOnSingleClick: return QVariant(false); case QPlatformTheme::ToolButtonStyle: @@ -140,6 +162,8 @@ QVariant QPlatformTheme::themeHint(ThemeHint hint) const return QVariant(false); case MaximumScrollBarDragDistance: return QVariant(-1); + case KeyboardScheme: + return QVariant(int(WindowsKeyboardScheme)); } return QVariant(); } diff --git a/src/gui/kernel/qplatformtheme_qpa.h b/src/gui/kernel/qplatformtheme_qpa.h index 036432054e..31a52a9391 100644 --- a/src/gui/kernel/qplatformtheme_qpa.h +++ b/src/gui/kernel/qplatformtheme_qpa.h @@ -69,7 +69,12 @@ public: SystemIconThemeName, SystemIconFallbackThemeName, IconThemeSearchPaths, - StyleNames + StyleNames, + WindowAutoPlacement, + DialogButtonBoxLayout, + DialogButtonBoxButtonsHaveIcons, + UseFullScreenForPopupMenu, + KeyboardScheme }; enum DialogType { @@ -84,6 +89,16 @@ public: NPalettes }; + enum KeyboardSchemes + { + WindowsKeyboardScheme, + MacKeyboardScheme, + X11KeyboardScheme, + KdeKeyboardScheme, + GnomeKeyboardScheme, + CdeKeyboardScheme + }; + virtual QPlatformMenu *createPlatformMenu(QMenu *menu = 0) const; virtual QPlatformMenuBar *createPlatformMenuBar(QMenuBar *menuBar = 0) const; diff --git a/src/gui/kernel/qsurfaceformat.cpp b/src/gui/kernel/qsurfaceformat.cpp index b97852dc1d..9021d82e20 100644 --- a/src/gui/kernel/qsurfaceformat.cpp +++ b/src/gui/kernel/qsurfaceformat.cpp @@ -106,10 +106,86 @@ public: int minor; }; +/*! + \class QSurfaceFormat + \brief The QSurfaceFormat class represents the format of a QSurface. + + The format includes the size of the color buffers, red, green, and blue; + the size of the alpha buffer; the size of the depth and stencil buffers; + and number of samples per pixel for multisampling. In addition, the format + contains surface configuration parameters such as OpenGL profile and + version for rendering, whether or not enable stereo buffers, and swap + behaviour. +*/ + +/*! + \enum QSurfaceFormat::FormatOption + + This enum contains format options for use with QSurfaceFormat. + + \value StereoBuffers Used to request stereo buffers in the surface format. + \value DebugContext Used to request a debug context with extra debugging information. + This requires OpenGL version 3.0 or higher. + \value DeprecatedFunctions Used to request that deprecated functions be included + in the OpenGL context profile. If not specified, you should get a forward compatible context + without support functionality marked as deprecated. This requires OpenGL version 3.0 or higher. +*/ + +/*! + \enum QSurfaceFormat::SwapBehavior + + This enum is used by QSurfaceFormat to specify the swap behaviour of a surface. The swap behaviour + is mostly transparent to the application, but it affects factors such as rendering latency and + throughput. + + \value DefaultSwapBehavior The default, unspecified swap behaviour of the platform. + \value SingleBuffer Used to request single buffering, which might result in flickering + when OpenGL rendering is done directly to screen without an intermediate offscreen + buffer. + \value DoubleBuffer This is typically the default swap behaviour on desktop platforms, + consisting of one back buffer and one front buffer. Rendering is done to the back + buffer, and then the back buffer and front buffer are swapped, or the contents of + the back buffer are copied to the front buffer, depending on the implementation. + \value TripleBuffer This swap behaviour is sometimes used in order to decrease the + risk of skipping a frame when the rendering rate is just barely keeping up with + the screen refresh rate. Depending on the platform it might also lead to slightly + more efficient use of the GPU due to improved pipelining behaviour. Triple buffering + comes at the cost of an extra frame of memory usage and latency, and might not be + supported depending on the underlying platform. +*/ + +/*! + \enum QSurfaceFormat::OpenGLContextProfile + + This enum is used to specify the OpenGL context profile, in + conjunction with QSurfaceFormat::setMajorVersion() and + QSurfaceFormat::setMinorVersion(). + + Profiles are exposed in OpenGL 3.2 and above, and are used + to choose between a restricted core profile, and a compatibility + profile which might contain deprecated support functionality. + + Note that the core profile might still contain functionality that + is deprecated and scheduled for removal in a higher version. To + get access to the deprecated functionality for the core profile + in the set OpenGL version you can use the QSurfaceFormat format option + QSurfaceFormat::DeprecatedFunctions. + + \value NoProfile OpenGL version is lower than 3.2. + \value CoreProfile Functionality deprecated in OpenGL version 3.0 is not available. + \value CompatibilityProfile Functionality from earlier OpenGL versions is available. +*/ + +/*! + Constructs a default initialized QSurfaceFormat. +*/ QSurfaceFormat::QSurfaceFormat() : d(new QSurfaceFormatPrivate) { } +/*! + Constructs a QSurfaceFormat with the given format \a options. +*/ QSurfaceFormat::QSurfaceFormat(QSurfaceFormat::FormatOptions options) : d(new QSurfaceFormatPrivate(options)) { @@ -131,7 +207,6 @@ void QSurfaceFormat::detach() /*! Constructs a copy of \a other. */ - QSurfaceFormat::QSurfaceFormat(const QSurfaceFormat &other) { d = other.d; @@ -141,7 +216,6 @@ QSurfaceFormat::QSurfaceFormat(const QSurfaceFormat &other) /*! Assigns \a other to this object. */ - QSurfaceFormat &QSurfaceFormat::operator=(const QSurfaceFormat &other) { if (d != other.d) { @@ -182,7 +256,6 @@ QSurfaceFormat::~QSurfaceFormat() \sa stereo() */ - void QSurfaceFormat::setStereo(bool enable) { QSurfaceFormat::FormatOptions newOptions = d->opts; @@ -199,8 +272,7 @@ void QSurfaceFormat::setStereo(bool enable) /*! Returns the number of samples per pixel when multisampling is - enabled. By default, the highest number of samples that is - available is used. + enabled. By default, multisampling is disabled. \sa setSampleBuffers(), sampleBuffers(), setSamples() */ @@ -211,8 +283,7 @@ int QSurfaceFormat::samples() const /*! Set the preferred number of samples per pixel when multisampling - is enabled to \a numSamples. By default, the highest number of - samples available is used. + is enabled to \a numSamples. By default, multisampling is disabled. \sa setSampleBuffers(), sampleBuffers(), samples() */ @@ -229,7 +300,6 @@ void QSurfaceFormat::setSamples(int numSamples) \sa testOption() */ - void QSurfaceFormat::setOption(QSurfaceFormat::FormatOptions opt) { const QSurfaceFormat::FormatOptions newOptions = d->opts | opt; @@ -244,7 +314,6 @@ void QSurfaceFormat::setOption(QSurfaceFormat::FormatOptions opt) \sa setOption() */ - bool QSurfaceFormat::testOption(QSurfaceFormat::FormatOptions opt) const { return d->opts & opt; @@ -273,6 +342,13 @@ int QSurfaceFormat::depthBufferSize() const return d->depthSize; } +/*! + Set the swap behaviour of the surface. + + The swap behaviour specifies whether single, double, or triple + buffering is desired. The default, SwapBehavior::DefaultSwapBehavior, + gives the default swap behavior of the platform. +*/ void QSurfaceFormat::setSwapBehavior(SwapBehavior behavior) { if (d->swapBehavior != behavior) { @@ -281,19 +357,29 @@ void QSurfaceFormat::setSwapBehavior(SwapBehavior behavior) } } +/*! + Returns the configured swap behaviour. + \sa setSwapBehavior() +*/ QSurfaceFormat::SwapBehavior QSurfaceFormat::swapBehavior() const { return d->swapBehavior; } +/*! + Returns true if the alpha buffer size is greater than zero. + + This means that the surface might be used with per pixel + translucency effects. +*/ bool QSurfaceFormat::hasAlpha() const { return d->alphaBufferSize > 0; } /*! - Set the preferred stencil buffer size to \a size. + Set the preferred stencil buffer size to \a size bits. \sa stencilBufferSize(), setStencil(), stencil() */ @@ -306,7 +392,7 @@ void QSurfaceFormat::setStencilBufferSize(int size) } /*! - Returns the stencil buffer size. + Returns the stencil buffer size in bits. \sa stencil(), setStencil(), setStencilBufferSize() */ @@ -315,26 +401,41 @@ int QSurfaceFormat::stencilBufferSize() const return d->stencilSize; } +/*! + Get the size in bits of the red channel of the color buffer. +*/ int QSurfaceFormat::redBufferSize() const { return d->redBufferSize; } +/*! + Get the size in bits of the green channel of the color buffer. +*/ int QSurfaceFormat::greenBufferSize() const { return d->greenBufferSize; } +/*! + Get the size in bits of the blue channel of the color buffer. +*/ int QSurfaceFormat::blueBufferSize() const { return d->blueBufferSize; } +/*! + Get the size in bits of the alpha channel of the color buffer. +*/ int QSurfaceFormat::alphaBufferSize() const { return d->alphaBufferSize; } +/*! + Set the desired size in bits of the red channel of the color buffer. +*/ void QSurfaceFormat::setRedBufferSize(int size) { if (d->redBufferSize != size) { @@ -343,6 +444,9 @@ void QSurfaceFormat::setRedBufferSize(int size) } } +/*! + Set the desired size in bits of the green channel of the color buffer. +*/ void QSurfaceFormat::setGreenBufferSize(int size) { if (d->greenBufferSize != size) { @@ -351,6 +455,9 @@ void QSurfaceFormat::setGreenBufferSize(int size) } } +/*! + Set the desired size in bits of the blue channel of the color buffer. +*/ void QSurfaceFormat::setBlueBufferSize(int size) { if (d->blueBufferSize != size) { @@ -359,6 +466,9 @@ void QSurfaceFormat::setBlueBufferSize(int size) } } +/*! + Set the desired size in bits of the alpha channel of the color buffer. +*/ void QSurfaceFormat::setAlphaBufferSize(int size) { if (d->alphaBufferSize != size) { @@ -368,10 +478,10 @@ void QSurfaceFormat::setAlphaBufferSize(int size) } /*! - Sets the desired OpenGL context profile. + Sets the desired OpenGL context profile. - This setting is ignored if the requested OpenGL version is - less than 3.2. + This setting is ignored if the requested OpenGL version is + less than 3.2. */ void QSurfaceFormat::setProfile(OpenGLContextProfile profile) { @@ -381,6 +491,12 @@ void QSurfaceFormat::setProfile(OpenGLContextProfile profile) } } +/*! + Get the configured OpenGL context profile. + + This setting is ignored if the requested OpenGL version is + less than 3.2. +*/ QSurfaceFormat::OpenGLContextProfile QSurfaceFormat::profile() const { return d->profile; @@ -428,6 +544,12 @@ int QSurfaceFormat::minorVersion() const return d->minor; } +/*! + Returns true if all the options of the two QSurfaceFormat objects + are equal. + + \relates QSurfaceFormat +*/ bool operator==(const QSurfaceFormat& a, const QSurfaceFormat& b) { return (a.d == b.d) || ((int) a.d->opts == (int) b.d->opts @@ -450,7 +572,6 @@ bool operator==(const QSurfaceFormat& a, const QSurfaceFormat& b) \relates QSurfaceFormat */ - bool operator!=(const QSurfaceFormat& a, const QSurfaceFormat& b) { return !(a == b); diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp index 9c6b6c4bf7..04c2617838 100644 --- a/src/gui/kernel/qwindow.cpp +++ b/src/gui/kernel/qwindow.cpp @@ -63,15 +63,17 @@ QT_BEGIN_NAMESPACE /*! \class QWindow - \brief The QWindow class encapsulates an independent window in a Windowing System. + \brief The QWindow class represents a window in the underlying windowing system. - A window that is supplied a parent become a native child window of + A window that is supplied a parent becomes a native child window of their parent window. + \section1 Resource management + Windows can potentially use a lot of memory. A usual measurement is - width * height * depth. A window might also include multiple buffers - to support double and triple buffering. To release a windows memory - resources, the destroy() function. + width times height times color depth. A window might also include multiple + buffers to support double and triple buffering, as well as depth and stencil + buffers. To release a window's memory resources, the destroy() function. \section1 Window and content orientation @@ -90,6 +92,29 @@ QT_BEGIN_NAMESPACE the contents instead, especially when doing rotation animations between different orientations. The windowing system might use this value to determine the layout of system popups or dialogs. + + \section1 Visibility and Windowing system exposure. + + By default, the window is not visible, and you must call setVisible(true), + or show() or similar to make it visible. To make a window hidden again, + call setVisible(false) or hide(). The visible property describes the state + the application wants the window to be in. Depending on the underlying + system, a visible window might still not be shown on the screen. It could, + for instance, be covered by other opaque windows or moved outside the + physical area of the screen. On windowing systems that have exposure + notifications, the isExposed() accessor describes whether the window should + be treated as directly visible on screen. The exposeEvent() function is + called whenever the windows exposure in the windowing system changes. On + windowing systems that do not make this information visible to the + application, isExposed() will simply return the same value as isVisible(). +*/ + +/*! + Creates a window as a top level on the given screen. + + The window is not shown until setVisible(true), show(), or similar is called. + + \sa setScreen() */ QWindow::QWindow(QScreen *targetScreen) : QObject(*new QWindowPrivate(), 0) @@ -108,6 +133,15 @@ QWindow::QWindow(QScreen *targetScreen) QGuiApplicationPrivate::window_list.prepend(this); } +/*! + Creates a window as a child of the given \a parent window. + + The window will be embedded inside the parent window, its coordinates relative to the parent. + + The screen is inherited from the parent. + + \sa setParent() +*/ QWindow::QWindow(QWindow *parent) : QObject(*new QWindowPrivate(), parent) , QSurface(QSurface::Window) @@ -134,6 +168,9 @@ QWindow::QWindow(QWindowPrivate &dd, QWindow *parent) QGuiApplicationPrivate::window_list.prepend(this); } +/*! + Destroys the window. +*/ QWindow::~QWindow() { if (QGuiApplicationPrivate::focus_window == this) @@ -146,18 +183,43 @@ QSurface::~QSurface() { } +/*! + Set the \a surfaceType of the window. + + Specifies whether the window is meant for raster rendering with + QBackingStore, or OpenGL rendering with QOpenGLContext. + + \sa QBackingStore, QOpenGLContext +*/ void QWindow::setSurfaceType(SurfaceType surfaceType) { Q_D(QWindow); d->surfaceType = surfaceType; } +/*! + Returns the surface type of the window. + + \sa setSurfaceType() +*/ QWindow::SurfaceType QWindow::surfaceType() const { Q_D(const QWindow); return d->surfaceType; } +/*! + \property QWindow::visible + \brief whether the window is visible or not + \since 5.0 + + This property controls the visibility of the window in the windowing system. + + By default, the window is not visible, you must call setVisible(true), or + show() or similar to make it visible. + + \sa show() +*/ void QWindow::setVisible(bool visible) { Q_D(QWindow); @@ -186,7 +248,10 @@ void QWindow::setVisible(bool visible) } } - +/*! + Returns true if the window is set to visible. + \obsolete +*/ bool QWindow::visible() const { return isVisible(); @@ -199,6 +264,20 @@ bool QWindow::isVisible() const return d->visible; } +/*! + Allocates the platform resources associated with the window. + + It is at this point that the surface format set using setFormat() gets resolved + into an actual native surface. However, the window remains hidden until setVisible() is called. + + Note that it is not usually necessary to call this function directly, as it will be implicitly + called by show(), setVisible(), and other functions that require access to the platform + resources. + + Call destroy() to free the platform resources if necessary. + + \sa destroy() +*/ void QWindow::create() { Q_D(QWindow); @@ -216,6 +295,14 @@ void QWindow::create() } } +/*! + Returns the window's platform id. + + For platforms where this id might be useful, the value returned + will uniquely represent the window inside the corresponding screen. + + \sa screen() +*/ WId QWindow::winId() const { Q_D(const QWindow); @@ -228,16 +315,22 @@ WId QWindow::winId() const return id; } +/*! + Returns the parent window, if any. + + A window without a parent is known as a top level window. +*/ QWindow *QWindow::parent() const { Q_D(const QWindow); return d->parentWindow; } -/** - Sets the parent Window. This will lead to the windowing system managing the clip of the window, so it will be clipped to the parent window. - Setting parent to be 0(NULL) means map it as a top level window. If the parent window has grabbed its window system resources, then the current window will also grab its window system resources. - **/ +/*! + Sets the parent Window. This will lead to the windowing system managing the clip of the window, so it will be clipped to the parent window. + + Setting parent to be 0 will make the window become a top level window. +*/ void QWindow::setParent(QWindow *parent) { @@ -257,46 +350,66 @@ void QWindow::setParent(QWindow *parent) } /*! - Returns whether the window is top level, i.e. has no parent window. - */ + Returns whether the window is top level, i.e. has no parent window. +*/ bool QWindow::isTopLevel() const { Q_D(const QWindow); return d->parentWindow == 0; } +/*! + Returns whether the window is modal. + + A modal window prevents other windows from getting any input. +*/ bool QWindow::isModal() const { Q_D(const QWindow); return d->modality != Qt::NonModal; } +/*! + Returns the window's modality. + + \sa setWindowModality() +*/ Qt::WindowModality QWindow::windowModality() const { Q_D(const QWindow); return d->modality; } +/*! + Sets the window's modality to \a windowModality. +*/ void QWindow::setWindowModality(Qt::WindowModality windowModality) { Q_D(QWindow); d->modality = windowModality; } +/*! + Sets the window's surface \a format. + + The format determines properties such as color depth, alpha, + depth and stencil buffer size, etc. +*/ void QWindow::setFormat(const QSurfaceFormat &format) { Q_D(QWindow); d->requestedFormat = format; } - /*! Returns the requested surfaceformat of this window. If the requested format was not supported by the platform implementation, the requestedFormat will differ from the actual window format. - \sa format. + This is the value set with setFormat(). + + \sa setFormat(), format() */ QSurfaceFormat QWindow::requestedFormat() const { @@ -304,6 +417,15 @@ QSurfaceFormat QWindow::requestedFormat() const return d->requestedFormat; } +/*! + Returns the actual format of this window. + + After the window has been created, this function will return the actual surface format + of the window. It might differ from the requested format if the requested format could + not be fulfilled by the platform. + + \sa create(), requestedFormat() +*/ QSurfaceFormat QWindow::format() const { Q_D(const QWindow); @@ -312,6 +434,15 @@ QSurfaceFormat QWindow::format() const return d->requestedFormat; } +/*! + Sets the window flags of the window to \a flags. + + The window flags control the window's appearance in the windowing system, + whether it's a dialog, popup, or a regular window, and whether it should + have a title bar, etc. + + \sa windowFlags() +*/ void QWindow::setWindowFlags(Qt::WindowFlags flags) { Q_D(QWindow); @@ -321,18 +452,46 @@ void QWindow::setWindowFlags(Qt::WindowFlags flags) d->windowFlags = flags; } +/*! + Returns the window flags of the window. + + This might differ from the flags set with setWindowFlags() if the + requested flags could not be fulfilled. + + \sa setWindowFlags() +*/ Qt::WindowFlags QWindow::windowFlags() const { Q_D(const QWindow); return d->windowFlags; } +/*! + Returns the type of the window. + + This returns the part of the window flags that represents + whether the window is a dialog, tooltip, popup, regular window, etc. + + \sa windowFlags(), setWindowFlags() +*/ Qt::WindowType QWindow::windowType() const { Q_D(const QWindow); return static_cast<Qt::WindowType>(int(d->windowFlags & Qt::WindowType_Mask)); } +/*! + \property QWindow::windowTitle + \brief the window's title in the windowing system + \since 5.0 + + The window title might appear in the title area of the window decorations, + depending on the windowing system and the window flags. It might also + be used by the windowing system to identify the window in other contexts, + such as in the task switcher. + + \sa windowFlags() +*/ void QWindow::setWindowTitle(const QString &title) { Q_D(QWindow); @@ -348,6 +507,11 @@ QString QWindow::windowTitle() const return d->windowTitle; } +/*! + Raise the window in the windowing system. + + Requests that the window be raised to appear above other windows. +*/ void QWindow::raise() { Q_D(QWindow); @@ -356,6 +520,11 @@ void QWindow::raise() } } +/*! + Lower the window in the windowing system. + + Requests that the window be lowered to appear below other windows. +*/ void QWindow::lower() { Q_D(QWindow); @@ -364,6 +533,16 @@ void QWindow::lower() } } +/*! + Sets the window's opacity in the windowing system to \a level. + + If the windowing system supports window opacity, this can be used to fade the + window in and out, or to make it semitransparent. + + A value of 1.0 or above is treated as fully opaque, whereas a value of 0.0 or below + is treated as fully transparent. Values inbetween represent varying levels of + translucency between the two extremes. +*/ void QWindow::setOpacity(qreal level) { Q_D(QWindow); @@ -372,6 +551,11 @@ void QWindow::setOpacity(qreal level) } } +/*! + Requests the window to be activated, i.e. receive keyboard focus. + + \sa isActive(), QGuiApplication::focusWindow() +*/ void QWindow::requestActivateWindow() { Q_D(QWindow); @@ -379,7 +563,6 @@ void QWindow::requestActivateWindow() d->platformWindow->requestActivateWindow(); } - /*! Returns if this window is exposed in the windowing system. @@ -388,8 +571,9 @@ void QWindow::requestActivateWindow() should minimize rendering and other graphical activities. An exposeEvent() is sent every time this value changes. - */ + \sa exposeEvent() +*/ bool QWindow::isExposed() const { Q_D(const QWindow); @@ -424,22 +608,26 @@ bool QWindow::isActive() const } /*! - Reports that the orientation of the window's contents have changed. + \property QWindow::contentOrientation + \since 5.0 + \brief the orientation of the window's contents + + This is a hint to the window manager in case it needs to display + additional content like popups, dialogs, status bars, or similar + in relation to the window. - This is a hint to the window manager in case it needs to display - additional content like popups, dialogs, status bars, or similar - in relation to the window. + The recommended orientation is QScreen::orientation() but + an application doesn't have to support all possible orientations, + and thus can opt to ignore the current screen orientation. - The recommended orientation is QScreen::orientation() but - an application doesn't have to support all possible orientations, - and thus can opt to ignore the current screen orientation. + The difference between the window and the content orientation + determines how much to rotate the content by. QScreen::angleBetween(), + QScreen::transformBetween(), and QScreen::mapBetween() can be used + to compute the necessary transform. - The difference between the window and the content orientation - determines how much to rotate the content by. QScreen::angleBetween(), - QScreen::transformBetween(), and QScreen::mapBetween() can be used - to compute the necessary transform. + The default value is Qt::PrimaryOrientation - \sa requestWindowOrientation(), QScreen::orientation() + \sa requestWindowOrientation(), QScreen::orientation() */ void QWindow::reportContentOrientationChange(Qt::ScreenOrientation orientation) { @@ -454,12 +642,6 @@ void QWindow::reportContentOrientationChange(Qt::ScreenOrientation orientation) emit contentOrientationChanged(orientation); } -/*! - Returns the actual content orientation. - - This is the last value set with reportContentOrientationChange(). It defaults - to Qt::PrimaryOrientation. -*/ Qt::ScreenOrientation QWindow::contentOrientation() const { Q_D(const QWindow); @@ -506,12 +688,27 @@ Qt::ScreenOrientation QWindow::windowOrientation() const return d->windowOrientation; } +/*! + Returns the window state. + + \sa setWindowState() +*/ Qt::WindowState QWindow::windowState() const { Q_D(const QWindow); return d->windowState; } +/*! + Sets the desired window \a state. + + The window state represents whether the window appears in the + windowing system as maximized, minimized, fullscreen, or normal. + + The enum value Qt::WindowActive is not an accepted parameter. + + \sa windowState(), showNormal(), showFullScreen(), showMinimized(), showMaximized() +*/ void QWindow::setWindowState(Qt::WindowState state) { if (state == Qt::WindowActive) { @@ -527,7 +724,11 @@ void QWindow::setWindowState(Qt::WindowState state) } /*! - Sets the transient parent, which is a hint to the window manager that this window is a dialog or pop-up on behalf of the given window. + Sets the transient parent + + This is a hint to the window manager that this window is a dialog or pop-up on behalf of the given window. + + \sa transientParent(), parent() */ void QWindow::setTransientParent(QWindow *parent) { @@ -538,6 +739,11 @@ void QWindow::setTransientParent(QWindow *parent) d->transientParent = parent; } +/*! + Returns the transient parent of the window. + + \sa setTransientParent(), parent() +*/ QWindow *QWindow::transientParent() const { Q_D(const QWindow); @@ -555,8 +761,8 @@ QWindow *QWindow::transientParent() const */ /*! - Returns true if the window is an ancestor of the given child. If mode is - IncludeTransients transient parents are also considered ancestors. + Returns true if the window is an ancestor of the given child. If mode is + IncludeTransients transient parents are also considered ancestors. */ bool QWindow::isAncestorOf(const QWindow *child, AncestorMode mode) const { @@ -567,30 +773,57 @@ bool QWindow::isAncestorOf(const QWindow *child, AncestorMode mode) const || (mode == IncludeTransients && child->transientParent() && isAncestorOf(child->transientParent(), mode)); } +/*! + Returns the minimum size of the window. + + \sa setMinimumSize() +*/ QSize QWindow::minimumSize() const { Q_D(const QWindow); return d->minimumSize; } +/*! + Returns the maximum size of the window. + + \sa setMaximumSize() +*/ QSize QWindow::maximumSize() const { Q_D(const QWindow); return d->maximumSize; } +/*! + Returns the base size of the window. + + \sa setBaseSize() +*/ QSize QWindow::baseSize() const { Q_D(const QWindow); return d->baseSize; } +/*! + Returns the size increment of the window. + + \sa setSizeIncrement() +*/ QSize QWindow::sizeIncrement() const { Q_D(const QWindow); return d->sizeIncrement; } +/*! + Sets the minimum size of the window. + + This is a hint to the window manager to prevent resizing below the specified \a size. + + \sa setMaximumSize(), minimumSize() +*/ void QWindow::setMinimumSize(const QSize &size) { Q_D(QWindow); @@ -602,6 +835,13 @@ void QWindow::setMinimumSize(const QSize &size) d->platformWindow->propagateSizeHints(); } +/*! + Sets the maximum size of the window. + + This is a hint to the window manager to prevent resizing above the specified \a size. + + \sa setMinimumSize(), maximumSize() +*/ void QWindow::setMaximumSize(const QSize &size) { Q_D(QWindow); @@ -613,6 +853,14 @@ void QWindow::setMaximumSize(const QSize &size) d->platformWindow->propagateSizeHints(); } +/*! + Sets the base size of the window. + + The base size is used to calculate a proper window size if the + window defines sizeIncrement(). + + \sa setMinimumSize(), setMaximumSize(), setSizeIncrement(), baseSize() +*/ void QWindow::setBaseSize(const QSize &size) { Q_D(QWindow); @@ -623,6 +871,20 @@ void QWindow::setBaseSize(const QSize &size) d->platformWindow->propagateSizeHints(); } +/*! + Sets the size increment of the window. + + When the user resizes the window, the size will move in steps of + sizeIncrement().width() pixels horizontally and + sizeIncrement().height() pixels vertically, with baseSize() as the + basis. + + By default, this property contains a size with zero width and height. + + The windowing system might not support size increments. + + \sa setBaseSize(), setMinimumSize(), setMaximumSize() +*/ void QWindow::setSizeIncrement(const QSize &size) { Q_D(QWindow); @@ -634,7 +896,12 @@ void QWindow::setSizeIncrement(const QSize &size) } /*! - Sets the geometry of the window excluding its window frame. + Sets the geometry of the window, excluding its window frame, to \a rect. + + To make sure the window is visible, make sure the geometry is within + the virtual geometry of its screen. + + \sa geometry(), screen(), QScreen::virtualGeometry() */ void QWindow::setGeometry(const QRect &rect) { @@ -661,7 +928,33 @@ void QWindow::setGeometry(const QRect &rect) } /*! - Returns the geometry of the window excluding its window frame. + \property QWindow::x + \since 5.0 + \brief the x position of the window's geometry +*/ + +/*! + \property QWindow::y + \since 5.0 + \brief the y position of the window's geometry +*/ + +/*! + \property QWindow::width + \since 5.0 + \brief the width of the window's geometry +*/ + +/*! + \property QWindow::height + \since 5.0 + \brief the height of the window's geometry +*/ + +/*! + Returns the geometry of the window, excluding its window frame. + + \sa frameMargins(), frameGeometry() */ QRect QWindow::geometry() const { @@ -673,6 +966,8 @@ QRect QWindow::geometry() const /*! Returns the window frame margins surrounding the window. + + \sa geometry(), frameGeometry() */ QMargins QWindow::frameMargins() const { @@ -683,7 +978,9 @@ QMargins QWindow::frameMargins() const } /*! - Returns the geometry of the window including its window frame. + Returns the geometry of the window, including its window frame. + + \sa geometry(), frameMargins() */ QRect QWindow::frameGeometry() const { @@ -696,7 +993,11 @@ QRect QWindow::frameGeometry() const } /*! - Returns the top left position of the window including its window frame. + Returns the top left position of the window, including its window frame. + + This returns the same value as frameGeometry().topLeft(). + + \sa geometry(), frameGeometry() */ QPoint QWindow::framePos() const { @@ -710,6 +1011,8 @@ QPoint QWindow::framePos() const /*! Sets the upper left position of the window including its window frame. + + \sa setGeometry(), frameGeometry() */ void QWindow::setFramePos(const QPoint &point) { @@ -722,6 +1025,11 @@ void QWindow::setFramePos(const QPoint &point) } } +/*! + Sets the size of the window to be \a newSize. + + \sa setGeometry() +*/ void QWindow::resize(const QSize &newSize) { Q_D(QWindow); @@ -732,18 +1040,23 @@ void QWindow::resize(const QSize &newSize) } } +/*! + Sets the window icon to the given \a icon image. + + The window icon might be used by the windowing system for example to decorate the window, + or in the task switcher. +*/ void QWindow::setWindowIcon(const QImage &icon) const { Q_UNUSED(icon); qDebug() << "unimplemented:" << __FILE__ << __LINE__; } - - /*! Releases the native platform resources associated with this window. - */ + \sa create() +*/ void QWindow::destroy() { Q_D(QWindow); @@ -761,18 +1074,37 @@ void QWindow::destroy() d->platformWindow = 0; } +/*! + Returns the platform window corresponding to the window. + + \internal +*/ QPlatformWindow *QWindow::handle() const { Q_D(const QWindow); return d->platformWindow; } +/*! + Returns the platform surface corresponding to the window. + + \internal +*/ QPlatformSurface *QWindow::surfaceHandle() const { Q_D(const QWindow); return d->platformWindow; } +/*! + Set whether keyboard grab should be enabled or not. + + If the return value is true, the window receives all key events until setKeyboardGrabEnabled(false) is + called; other windows get no key events at all. Mouse events are not affected. + Use setMouseGrabEnabled() if you want to grab that. + + \sa setMouseGrabEnabled() +*/ bool QWindow::setKeyboardGrabEnabled(bool grab) { Q_D(QWindow); @@ -781,6 +1113,15 @@ bool QWindow::setKeyboardGrabEnabled(bool grab) return false; } +/*! + Sets whether mouse grab should be enabled or not. + + If the return value is true, the window receives all mouse events until setMouseGrabEnabled(false) is + called; other windows get no mouse events at all. Keyboard events are not affected. + Use setKeyboardGrabEnabled() if you want to grab that. + + \sa setKeyboardGrabEnabled() +*/ bool QWindow::setMouseGrabEnabled(bool grab) { Q_D(QWindow); @@ -789,12 +1130,30 @@ bool QWindow::setMouseGrabEnabled(bool grab) return false; } +/*! + Returns the screen on which the window is shown. + + The value returned will not change when the window is moved + between virtual screens (as returned by QScreen::virtualSiblings()). + + \sa setScreen(), QScreen::virtualSiblings() +*/ QScreen *QWindow::screen() const { Q_D(const QWindow); return d->screen; } +/*! + Sets the screen on which the window should be shown. + + If the window has been created, it will be recreated on the new screen. + + Note that if the screen is part of a virtual desktop of multiple screens, + the window can appear on any of the screens returned by QScreen::virtualSiblings(). + + \sa screen(), QScreen::virtualSiblings() +*/ void QWindow::setScreen(QScreen *newScreen) { Q_D(QWindow); @@ -833,7 +1192,7 @@ void QWindow::screenDestroyed(QObject *object) /*! Returns the accessibility interface for the object that the window represents - \preliminary + \internal \sa QAccessible */ QAccessibleInterface *QWindow::accessibleRoot() const @@ -849,14 +1208,22 @@ QAccessibleInterface *QWindow::accessibleRoot() const */ /*! - Returns the QObject that will be the final receiver of events tied focus, such - as key events. + Returns the QObject that will be the final receiver of events tied focus, such + as key events. */ QObject *QWindow::focusObject() const { return const_cast<QWindow *>(this); } +/*! + Shows the window. + + This equivalent to calling showFullScreen() or showNormal(), depending + on whether the platform defaults to windows being fullscreen or not. + + \sa showFullScreen(), showNormal(), hide(), QStyleHints::showIsFullScreen() +*/ void QWindow::show() { if (qApp->styleHints()->showIsFullScreen()) @@ -865,23 +1232,54 @@ void QWindow::show() showNormal(); } +/*! + Hides the window. + + Equivalent to calling setVisible(false). + + \sa show(), setVisible() +*/ void QWindow::hide() { setVisible(false); } +/*! + Shows the window as minimized. + + Equivalent to calling setWindowState(Qt::WindowMinimized) and then + setVisible(true). + + \sa setWindowState(), setVisible() +*/ void QWindow::showMinimized() { setWindowState(Qt::WindowMinimized); setVisible(true); } +/*! + Shows the window as maximized. + + Equivalent to calling setWindowState(Qt::WindowMaximized) and then + setVisible(true). + + \sa setWindowState(), setVisible() +*/ void QWindow::showMaximized() { setWindowState(Qt::WindowMaximized); setVisible(true); } +/*! + Shows the window as fullscreen. + + Equivalent to calling setWindowState(Qt::WindowFullScreen) and then + setVisible(true). + + \sa setWindowState(), setVisible() +*/ void QWindow::showFullScreen() { setWindowState(Qt::WindowFullScreen); @@ -889,12 +1287,28 @@ void QWindow::showFullScreen() requestActivateWindow(); } +/*! + Shows the window as normal, i.e. neither maximized, minimized, nor fullscreen. + + Equivalent to calling setWindowState(Qt::WindowNoState) and then + setVisible(true). + + \sa setWindowState(), setVisible() +*/ void QWindow::showNormal() { setWindowState(Qt::WindowNoState); setVisible(true); } +/*! + Close the window. + + This closes the window, effectively calling destroy(), and + potentially quitting the application + + \sa destroy(), QGuiApplication::quitOnLastWindowClosed() +*/ bool QWindow::close() { Q_D(QWindow); @@ -912,8 +1326,6 @@ bool QWindow::close() return true; } - - /*! The expose event is sent by the window system whenever the window's exposure on screen changes. @@ -923,33 +1335,60 @@ bool QWindow::close() value of isExposed() might change to false. When this happens, an application should stop its rendering as it is no longer visible to the user. - */ + \sa isExposed() +*/ void QWindow::exposeEvent(QExposeEvent *ev) { ev->ignore(); } +/*! + Override this to handle mouse events. +*/ void QWindow::moveEvent(QMoveEvent *ev) { ev->ignore(); } +/*! + Override this to handle resize events. + + The resize event is called whenever the window is resized in the windowing system, + either directly through the windowing system acknowledging a setGeometry() or resize() request, + or indirectly through the user resizing the window manually. +*/ void QWindow::resizeEvent(QResizeEvent *ev) { ev->ignore(); } +/*! + Override this to handle show events. + + The show event is called when the window becomes visible in the windowing system. +*/ void QWindow::showEvent(QShowEvent *ev) { ev->ignore(); } +/*! + Override this to handle show events. + + The show event is called when the window becomes hidden in the windowing system. +*/ void QWindow::hideEvent(QHideEvent *ev) { ev->ignore(); } +/*! + Override this to handle any event sent to the window. + + Remembet to call the base class version if you wish for mouse events, + key events, resize events, etc to be dispatched as usual. +*/ bool QWindow::event(QEvent *ev) { switch (ev->type()) { @@ -1032,58 +1471,111 @@ bool QWindow::event(QEvent *ev) return true; } +/*! + Override this to handle key press events. + + \sa keyReleaseEvent +*/ void QWindow::keyPressEvent(QKeyEvent *ev) { ev->ignore(); } +/*! + Override this to handle key release events. + + \sa keyPressEvent +*/ void QWindow::keyReleaseEvent(QKeyEvent *ev) { ev->ignore(); } +/*! + Override this to handle focus in events. + + Focus in events are sent when the window receives keyboard focus. + + \sa focusOutEvent +*/ void QWindow::focusInEvent(QFocusEvent *ev) { ev->ignore(); } +/*! + Override this to handle focus out events. + + Focus out events are sent when the window loses keyboard focus. + + \sa focusInEvent +*/ void QWindow::focusOutEvent(QFocusEvent *ev) { ev->ignore(); } +/*! + Override this to handle mouse press events. + + \sa mouseReleaseEvent() +*/ void QWindow::mousePressEvent(QMouseEvent *ev) { ev->ignore(); } +/*! + Override this to handle mouse release events. + + \sa mousePressEvent() +*/ void QWindow::mouseReleaseEvent(QMouseEvent *ev) { ev->ignore(); } +/*! + Override this to handle mouse double click events. + + \sa mousePressEvent(), QStyleHints::mouseDoubleClickInterval() +*/ void QWindow::mouseDoubleClickEvent(QMouseEvent *ev) { ev->ignore(); } +/*! + Override this to handle mouse move events. +*/ void QWindow::mouseMoveEvent(QMouseEvent *ev) { ev->ignore(); } #ifndef QT_NO_WHEELEVENT +/*! + Override this to handle mouse wheel or other wheel events. +*/ void QWindow::wheelEvent(QWheelEvent *ev) { ev->ignore(); } #endif //QT_NO_WHEELEVENT +/*! + Override this to handle touch events. +*/ void QWindow::touchEvent(QTouchEvent *ev) { ev->ignore(); } +/*! + Override this to handle platform dependent events. + + This might make your application non-portable. +*/ bool QWindow::nativeEvent(const QByteArray &eventType, void *message, long *result) { Q_UNUSED(eventType); @@ -1101,14 +1593,12 @@ bool QWindow::nativeEvent(const QByteArray &eventType, void *message, long *resu \sa mapFromGlobal() */ - QPoint QWindow::mapToGlobal(const QPoint &pos) const { return pos + d_func()->globalPosition(); } - /*! \fn QPoint QWindow::mapFromGlobal(const QPoint &pos) const @@ -1117,14 +1607,12 @@ QPoint QWindow::mapToGlobal(const QPoint &pos) const \sa mapToGlobal() */ - QPoint QWindow::mapFromGlobal(const QPoint &pos) const { return pos - d_func()->globalPosition(); } - Q_GUI_EXPORT QWindowPrivate *qt_window_private(QWindow *window) { return window->d_func(); diff --git a/src/gui/kernel/qwindowsysteminterface_qpa.cpp b/src/gui/kernel/qwindowsysteminterface_qpa.cpp index e6c4454104..40a4ec07a6 100644 --- a/src/gui/kernel/qwindowsysteminterface_qpa.cpp +++ b/src/gui/kernel/qwindowsysteminterface_qpa.cpp @@ -189,8 +189,53 @@ void QWindowSystemInterface::handleWheelEvent(QWindow *w, const QPointF & local, void QWindowSystemInterface::handleWheelEvent(QWindow *tlw, ulong timestamp, const QPointF & local, const QPointF & global, int d, Qt::Orientation o, Qt::KeyboardModifiers mods) { - QWindowSystemInterfacePrivate::WheelEvent *e = - new QWindowSystemInterfacePrivate::WheelEvent(tlw, timestamp, local, global, d, o, mods); + QPoint point = (o == Qt::Vertical) ? QPoint(0, d) : QPoint(d, 0); + handleWheelEvent(tlw, timestamp, local, global, point, point, mods); +} + +void QWindowSystemInterface::handleWheelEvent(QWindow *w, const QPointF & local, const QPointF & global, QPoint pixelDelta, QPoint angleDelta, Qt::KeyboardModifiers mods) +{ + unsigned long time = QWindowSystemInterfacePrivate::eventTime.elapsed(); + handleWheelEvent(w, time, local, global, pixelDelta, angleDelta, mods); +} + +void QWindowSystemInterface::handleWheelEvent(QWindow *tlw, ulong timestamp, const QPointF & local, const QPointF & global, QPoint pixelDelta, QPoint angleDelta, Qt::KeyboardModifiers mods) +{ + // Qt 4 sends two separate wheel events for horizontal and vertical + // deltas. For Qt 5 we want to send the deltas in one event, but at the + // same time preserve source and behavior compatibility with Qt 4. + // + // In addition high-resolution pixel-based deltas are also supported. + // Platforms that does not support these may pass a null point here. + // Angle deltas must always be sent in addition to pixel deltas. + QWindowSystemInterfacePrivate::WheelEvent *e; + + if (angleDelta.isNull()) + return; + + // Simple case: vertical deltas only: + if (angleDelta.y() != 0 && angleDelta.x() == 0) { + e = new QWindowSystemInterfacePrivate::WheelEvent(tlw, timestamp, local, global, pixelDelta, angleDelta, angleDelta.y(), Qt::Vertical, mods); + QWindowSystemInterfacePrivate::queueWindowSystemEvent(e); + return; + } + + // Simple case: horizontal deltas only: + if (angleDelta.y() == 0 && angleDelta.x() != 0) { + e = new QWindowSystemInterfacePrivate::WheelEvent(tlw, timestamp, local, global, pixelDelta, angleDelta, angleDelta.x(), Qt::Horizontal, mods); + QWindowSystemInterfacePrivate::queueWindowSystemEvent(e); + return; + } + + // Both horizontal and vertical deltas: Send two wheel events. + // The first event contains the Qt 5 pixel and angle delta as points, + // and in addition the Qt 4 compatibility vertical angle delta. + e = new QWindowSystemInterfacePrivate::WheelEvent(tlw, timestamp, local, global, pixelDelta, angleDelta, angleDelta.y(), Qt::Vertical, mods); + QWindowSystemInterfacePrivate::queueWindowSystemEvent(e); + + // The second event contains null pixel and angle points and the + // Qt 4 compatibility horizontal angle delta. + e = new QWindowSystemInterfacePrivate::WheelEvent(tlw, timestamp, local, global, QPoint(), QPoint(), angleDelta.x(), Qt::Horizontal, mods); QWindowSystemInterfacePrivate::queueWindowSystemEvent(e); } diff --git a/src/gui/kernel/qwindowsysteminterface_qpa.h b/src/gui/kernel/qwindowsysteminterface_qpa.h index 78152a1178..836fb40bd7 100644 --- a/src/gui/kernel/qwindowsysteminterface_qpa.h +++ b/src/gui/kernel/qwindowsysteminterface_qpa.h @@ -80,7 +80,10 @@ public: quint32 nativeModifiers, const QString& text = QString(), bool autorep = false, ushort count = 1); + static void handleWheelEvent(QWindow *w, const QPointF & local, const QPointF & global, QPoint pixelDelta, QPoint angleDelta, Qt::KeyboardModifiers mods = Qt::NoModifier); + static void handleWheelEvent(QWindow *w, ulong timestamp, const QPointF & local, const QPointF & global, QPoint pixelDelta, QPoint angleDelta, Qt::KeyboardModifiers mods = Qt::NoModifier); + // Wheel event compatibility functions. Will be removed: do not use. static void handleWheelEvent(QWindow *w, const QPointF & local, const QPointF & global, int d, Qt::Orientation o, Qt::KeyboardModifiers mods = Qt::NoModifier); static void handleWheelEvent(QWindow *w, ulong timestamp, const QPointF & local, const QPointF & global, int d, Qt::Orientation o, Qt::KeyboardModifiers mods = Qt::NoModifier); diff --git a/src/gui/kernel/qwindowsysteminterface_qpa_p.h b/src/gui/kernel/qwindowsysteminterface_qpa_p.h index 661b39da88..f5c141b4c9 100644 --- a/src/gui/kernel/qwindowsysteminterface_qpa_p.h +++ b/src/gui/kernel/qwindowsysteminterface_qpa_p.h @@ -157,13 +157,15 @@ public: class WheelEvent : public InputEvent { public: - WheelEvent(QWindow *w, ulong time, const QPointF & local, const QPointF & global, int d, - Qt::Orientation o, Qt::KeyboardModifiers mods) - : InputEvent(w, time, Wheel, mods), delta(d), localPos(local), globalPos(global), orient(o) { } - int delta; + WheelEvent(QWindow *w, ulong time, const QPointF & local, const QPointF & global, QPoint pixelD, QPoint angleD, int qt4D, Qt::Orientation qt4O, + Qt::KeyboardModifiers mods) + : InputEvent(w, time, Wheel, mods), pixelDelta(pixelD), angleDelta(angleD), qt4Delta(qt4D), qt4Orientation(qt4O), localPos(local), globalPos(global) { } + QPoint pixelDelta; + QPoint angleDelta; + int qt4Delta; + Qt::Orientation qt4Orientation; QPointF localPos; QPointF globalPos; - Qt::Orientation orient; }; class KeyEvent : public InputEvent { diff --git a/src/gui/opengl/qopengl.cpp b/src/gui/opengl/qopengl.cpp index f39dc12239..290fcb287e 100644 --- a/src/gui/opengl/qopengl.cpp +++ b/src/gui/opengl/qopengl.cpp @@ -42,6 +42,7 @@ #include "qopengl_p.h" #include "qopenglcontext.h" +#include "qopenglfunctions.h" QT_BEGIN_NAMESPACE @@ -50,7 +51,7 @@ QOpenGLExtensionMatcher::QOpenGLExtensionMatcher(const char *str) init(str); } -typedef GLubyte * (*qt_glGetStringi)(GLenum, GLuint); +typedef const GLubyte * (QOPENGLF_APIENTRYP qt_glGetStringi)(GLenum, GLuint); #ifndef GL_NUM_EXTENSIONS #define GL_NUM_EXTENSIONS 0x821D diff --git a/src/gui/opengl/qopenglbuffer.cpp b/src/gui/opengl/qopenglbuffer.cpp index e6879a9e60..f47f71c121 100644 --- a/src/gui/opengl/qopenglbuffer.cpp +++ b/src/gui/opengl/qopenglbuffer.cpp @@ -49,16 +49,16 @@ QT_BEGIN_NAMESPACE /*! \class QOpenGLBuffer - \brief The QOpenGLBuffer class provides functions for creating and managing GL buffer objects. + \brief The QOpenGLBuffer class provides functions for creating and managing OpenGL buffer objects. \since 5.0 \ingroup painting-3D - Buffer objects are created in the GL server so that the + Buffer objects are created in the OpenGL server so that the client application can avoid uploading vertices, indices, texture image data, etc every time they are needed. QOpenGLBuffer objects can be copied around as a reference to the - underlying GL buffer object: + underlying OpenGL buffer object: \code QOpenGLBuffer buffer1(QOpenGLBuffer::IndexBuffer); @@ -74,16 +74,16 @@ QT_BEGIN_NAMESPACE /*! \enum QOpenGLBuffer::Type - This enum defines the type of GL buffer object to create with QOpenGLBuffer. + This enum defines the type of OpenGL buffer object to create with QOpenGLBuffer. \value VertexBuffer Vertex buffer object for use when specifying vertex arrays. \value IndexBuffer Index buffer object for use with \c{glDrawElements()}. \value PixelPackBuffer Pixel pack buffer object for reading pixel - data from the GL server (for example, with \c{glReadPixels()}). + data from the OpenGL server (for example, with \c{glReadPixels()}). Not supported under OpenGL/ES. \value PixelUnpackBuffer Pixel unpack buffer object for writing pixel - data to the GL server (for example, with \c{glTexImage2D()}). + data to the OpenGL server (for example, with \c{glTexImage2D()}). Not supported under OpenGL/ES. */ @@ -95,26 +95,26 @@ QT_BEGIN_NAMESPACE for drawing operations. Under OpenGL/ES 1.1 this is identical to StaticDraw. \value StreamRead The data will be set once and used a few times - for reading data back from the GL server. Not supported + for reading data back from the OpenGL server. Not supported under OpenGL/ES. \value StreamCopy The data will be set once and used a few times - for reading data back from the GL server for use in further + for reading data back from the OpenGL server for use in further drawing operations. Not supported under OpenGL/ES. \value StaticDraw The data will be set once and used many times for drawing operations. \value StaticRead The data will be set once and used many times - for reading data back from the GL server. Not supported + for reading data back from the OpenGL server. Not supported under OpenGL/ES. \value StaticCopy The data will be set once and used many times - for reading data back from the GL server for use in further + for reading data back from the OpenGL server for use in further drawing operations. Not supported under OpenGL/ES. \value DynamicDraw The data will be modified repeatedly and used many times for drawing operations. \value DynamicRead The data will be modified repeatedly and used - many times for reading data back from the GL server. + many times for reading data back from the OpenGL server. Not supported under OpenGL/ES. \value DynamicCopy The data will be modified repeatedly and used - many times for reading data back from the GL server for + many times for reading data back from the OpenGL server for use in further drawing operations. Not supported under OpenGL/ES. */ @@ -152,7 +152,7 @@ public: Constructs a new buffer object of type QOpenGLBuffer::VertexBuffer. Note: this constructor just creates the QOpenGLBuffer instance. The actual - buffer object in the GL server is not created until create() is called. + buffer object in the OpenGL server is not created until create() is called. \sa create() */ @@ -165,7 +165,7 @@ QOpenGLBuffer::QOpenGLBuffer() Constructs a new buffer object of \a type. Note: this constructor just creates the QOpenGLBuffer instance. The actual - buffer object in the GL server is not created until create() is called. + buffer object in the OpenGL server is not created until create() is called. \sa create() */ @@ -188,7 +188,7 @@ QOpenGLBuffer::QOpenGLBuffer(const QOpenGLBuffer &other) /*! Destroys this buffer object, including the storage being - used in the GL server. + used in the OpenGL server. */ QOpenGLBuffer::~QOpenGLBuffer() { @@ -256,14 +256,14 @@ namespace { } /*! - Creates the buffer object in the GL server. Returns true if + Creates the buffer object in the OpenGL server. Returns true if the object was created; false otherwise. This function must be called with a current QOpenGLContext. The buffer will be bound to and can only be used in that context (or any other context that is shared with it). - This function will return false if the GL implementation + This function will return false if the OpenGL implementation does not support buffers, or there is no current QOpenGLContext. \sa isCreated(), allocate(), write(), destroy() @@ -303,7 +303,7 @@ bool QOpenGLBuffer::isCreated() const /*! Destroys this buffer object, including the storage being - used in the GL server. All references to the buffer will + used in the OpenGL server. All references to the buffer will become invalid. */ void QOpenGLBuffer::destroy() @@ -398,8 +398,8 @@ void QOpenGLBuffer::allocate(const void *data, int count) /*! Binds the buffer associated with this object to the current - GL context. Returns false if binding was not possible, usually because - type() is not supported on this GL implementation. + OpenGL context. Returns false if binding was not possible, usually because + type() is not supported on this OpenGL implementation. The buffer must be bound to the same QOpenGLContext current when create() was called, or to another QOpenGLContext that is sharing with it. @@ -431,7 +431,7 @@ bool QOpenGLBuffer::bind() /*! Releases the buffer associated with this object from the - current GL context. + current OpenGL context. This function must be called with the same QOpenGLContext current as when bind() was called on the buffer. @@ -470,7 +470,7 @@ void QOpenGLBuffer::release(QOpenGLBuffer::Type type) } /*! - Returns the GL identifier associated with this buffer; zero if + Returns the OpenGL identifier associated with this buffer; zero if the buffer has not been created. \sa isCreated() diff --git a/src/gui/opengl/qopenglframebufferobject.cpp b/src/gui/opengl/qopenglframebufferobject.cpp index 0eb264b2d9..a523cd2cf1 100644 --- a/src/gui/opengl/qopenglframebufferobject.cpp +++ b/src/gui/opengl/qopenglframebufferobject.cpp @@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE { \ GLenum err = glGetError(); \ if (err != GL_NO_ERROR) { \ - qDebug("[%s line %d] GL Error: %d", \ + qDebug("[%s line %d] OpenGL Error: %d", \ __FILE__, __LINE__, (int)err); \ } \ } @@ -649,13 +649,13 @@ void QOpenGLFramebufferObjectPrivate::initAttachments(QOpenGLContext *ctx, QOpen The QOpenGLFramebufferObject class encapsulates an OpenGL framebuffer object, defined by the \c{GL_EXT_framebuffer_object} extension. In addition it provides a rendering surface that can be painted on - with a QPainter, rendered to using native GL calls, or both. This - surface can be bound and used as a regular texture in your own GL + with a QPainter, rendered to using native OpenGL calls, or both. This + surface can be bound and used as a regular texture in your own OpenGL drawing code. By default, the QOpenGLFramebufferObject class - generates a 2D GL texture (using the \c{GL_TEXTURE_2D} target), + generates a 2D OpenGL texture (using the \c{GL_TEXTURE_2D} target), which is used as the internal rendering target. - \bold{It is important to have a current GL context when creating a + \bold{It is important to have a current OpenGL context when creating a QOpenGLFramebufferObject, otherwise initialization will fail.} When using a QPainter to paint to a QOpenGLFramebufferObject you should take @@ -708,11 +708,11 @@ void QOpenGLFramebufferObjectPrivate::initAttachments(QOpenGLContext *ctx, QOpen /*! \fn QOpenGLFramebufferObject::QOpenGLFramebufferObject(const QSize &size, GLenum target) - Constructs an OpenGL framebuffer object and binds a 2D GL texture + Constructs an OpenGL framebuffer object and binds a 2D OpenGL texture to the buffer of the size \a size. The texture is bound to the \c GL_COLOR_ATTACHMENT0 target in the framebuffer object. - The \a target parameter is used to specify the GL texture + The \a target parameter is used to specify the OpenGL texture target. The default target is \c GL_TEXTURE_2D. Keep in mind that \c GL_TEXTURE_2D textures must have a power of 2 width and height (e.g. 256x512), unless you are using OpenGL 2.0 or higher. @@ -723,7 +723,7 @@ void QOpenGLFramebufferObjectPrivate::initAttachments(QOpenGLContext *ctx, QOpen The default internal texture format is \c GL_RGBA8 for desktop OpenGL, and \c GL_RGBA for OpenGL/ES. - It is important that you have a current GL context set when + It is important that you have a current OpenGL context set when creating the QOpenGLFramebufferObject, otherwise the initialization will fail. @@ -739,7 +739,7 @@ QOpenGLFramebufferObject::QOpenGLFramebufferObject(const QSize &size, GLenum tar /*! \overload - Constructs an OpenGL framebuffer object and binds a 2D GL texture + Constructs an OpenGL framebuffer object and binds a 2D OpenGL texture to the buffer of the given \a width and \a height. \sa size(), texture() @@ -931,7 +931,7 @@ bool QOpenGLFramebufferObject::release() Returns the texture id for the texture attached as the default rendering target in this framebuffer object. This texture id can - be bound as a normal texture in your own GL code. + be bound as a normal texture in your own OpenGL code. If a multisample framebuffer object is used then the value returned from this function will be invalid. @@ -1109,7 +1109,7 @@ bool QOpenGLFramebufferObject::hasOpenGLFramebufferObjects() /*! \fn GLuint QOpenGLFramebufferObject::handle() const - Returns the GL framebuffer object handle for this framebuffer + Returns the OpenGL framebuffer object handle for this framebuffer object (returned by the \c{glGenFrameBuffersEXT()} function). This handle can be used to attach new images or buffers to the framebuffer. The user is responsible for cleaning up and diff --git a/src/gui/opengl/qopenglfunctions.cpp b/src/gui/opengl/qopenglfunctions.cpp index 13f91e2ad8..c2e177c162 100644 --- a/src/gui/opengl/qopenglfunctions.cpp +++ b/src/gui/opengl/qopenglfunctions.cpp @@ -421,7 +421,7 @@ bool QOpenGLExtensions::hasOpenGLExtension(QOpenGLExtensions::OpenGLExtension ex } /*! - Initializes GL function resolution for the current context. + Initializes OpenGL function resolution for the current context. After calling this function, the QOpenGLFunctions object can only be used with the current context and other contexts that share with it. diff --git a/src/gui/opengl/qopenglpaintdevice.cpp b/src/gui/opengl/qopenglpaintdevice.cpp index 118fe63122..32da27a078 100644 --- a/src/gui/opengl/qopenglpaintdevice.cpp +++ b/src/gui/opengl/qopenglpaintdevice.cpp @@ -63,10 +63,10 @@ QT_BEGIN_NAMESPACE \ingroup painting-3D When painting to a QOpenGLPaintDevice using QPainter, the state of - the current GL context will be altered by the paint engine to reflect - its needs. Applications should not rely upon the GL state being reset + the current OpenGL context will be altered by the paint engine to reflect + its needs. Applications should not rely upon the OpenGL state being reset to its original conditions, particularly the current shader program, - GL viewport, texture units, and drawing modes. + OpenGL viewport, texture units, and drawing modes. */ class QOpenGLPaintDevicePrivate diff --git a/src/gui/painting/qbrush.cpp b/src/gui/painting/qbrush.cpp index c8dc370a8b..6850eac59e 100644 --- a/src/gui/painting/qbrush.cpp +++ b/src/gui/painting/qbrush.cpp @@ -957,7 +957,6 @@ bool QBrush::operator==(const QBrush &b) const */ QDebug operator<<(QDebug dbg, const QBrush &b) { -#ifndef Q_BROKEN_DEBUG_STREAM static const char *BRUSH_STYLES[] = { "NoBrush", "SolidPattern", @@ -983,11 +982,6 @@ QDebug operator<<(QDebug dbg, const QBrush &b) dbg.nospace() << "QBrush(" << b.color() << ',' << BRUSH_STYLES[b.style()] << ')'; return dbg.space(); -#else - qWarning("This compiler doesn't support streaming QBrush to QDebug"); - return dbg; - Q_UNUSED(b); -#endif } #endif diff --git a/src/gui/painting/qcolor.cpp b/src/gui/painting/qcolor.cpp index 2c95434843..96491918cd 100644 --- a/src/gui/painting/qcolor.cpp +++ b/src/gui/painting/qcolor.cpp @@ -2399,7 +2399,6 @@ void QColor::invalidate() #ifndef QT_NO_DEBUG_STREAM QDebug operator<<(QDebug dbg, const QColor &c) { -#ifndef Q_BROKEN_DEBUG_STREAM if (!c.isValid()) dbg.nospace() << "QColor(Invalid)"; else if (c.spec() == QColor::Rgb) @@ -2413,11 +2412,6 @@ QDebug operator<<(QDebug dbg, const QColor &c) dbg.nospace() << "QColor(AHSL " << c.alphaF() << ", " << c.hslHueF() << ", " << c.hslSaturationF() << ", " << c.lightnessF() << ')'; return dbg.space(); -#else - qWarning("This compiler doesn't support streaming QColor to QDebug"); - return dbg; - Q_UNUSED(c); -#endif } #endif diff --git a/src/gui/painting/qfixed_p.h b/src/gui/painting/qfixed_p.h index d30328b0fa..44772a4bb5 100644 --- a/src/gui/painting/qfixed_p.h +++ b/src/gui/painting/qfixed_p.h @@ -60,48 +60,50 @@ QT_BEGIN_NAMESPACE struct QFixed { +private: + Q_DECL_CONSTEXPR QFixed(int val, int) : val(val) {} // 2nd int is just a dummy for disambiguation public: - QFixed() : val(0) {} - QFixed(int i) : val(i<<6) {} - QFixed(long i) : val(i<<6) {} + Q_DECL_CONSTEXPR QFixed() : val(0) {} + Q_DECL_CONSTEXPR QFixed(int i) : val(i<<6) {} + Q_DECL_CONSTEXPR QFixed(long i) : val(i<<6) {} QFixed &operator=(int i) { val = (i<<6); return *this; } QFixed &operator=(long i) { val = (i<<6); return *this; } - static QFixed fromReal(qreal r) { QFixed f; f.val = (int)(r*qreal(64)); return f; } - static QFixed fromFixed(int fixed) { QFixed f; f.val = fixed; return f; } + Q_DECL_CONSTEXPR static QFixed fromReal(qreal r) { return fromFixed((int)(r*qreal(64))); } + Q_DECL_CONSTEXPR static QFixed fromFixed(int fixed) { return QFixed(fixed,0); } // uses private ctor - inline int value() const { return val; } + Q_DECL_CONSTEXPR inline int value() const { return val; } inline void setValue(int value) { val = value; } - inline int toInt() const { return (((val)+32) & -64)>>6; } - inline qreal toReal() const { return ((qreal)val)/(qreal)64; } + Q_DECL_CONSTEXPR inline int toInt() const { return (((val)+32) & -64)>>6; } + Q_DECL_CONSTEXPR inline qreal toReal() const { return ((qreal)val)/(qreal)64; } - inline int truncate() const { return val>>6; } - inline QFixed round() const { QFixed f; f.val = ((val)+32) & -64; return f; } - inline QFixed floor() const { QFixed f; f.val = (val) & -64; return f; } - inline QFixed ceil() const { QFixed f; f.val = (val+63) & -64; return f; } + Q_DECL_CONSTEXPR inline int truncate() const { return val>>6; } + Q_DECL_CONSTEXPR inline QFixed round() const { return fromFixed(((val)+32) & -64); } + Q_DECL_CONSTEXPR inline QFixed floor() const { return fromFixed((val) & -64); } + Q_DECL_CONSTEXPR inline QFixed ceil() const { return fromFixed((val+63) & -64); } - inline QFixed operator+(int i) const { QFixed f; f.val = (val + (i<<6)); return f; } - inline QFixed operator+(uint i) const { QFixed f; f.val = (val + (i<<6)); return f; } - inline QFixed operator+(const QFixed &other) const { QFixed f; f.val = (val + other.val); return f; } + Q_DECL_CONSTEXPR inline QFixed operator+(int i) const { return fromFixed((val + (i<<6))); } + Q_DECL_CONSTEXPR inline QFixed operator+(uint i) const { return fromFixed((val + (i<<6))); } + Q_DECL_CONSTEXPR inline QFixed operator+(const QFixed &other) const { return fromFixed((val + other.val)); } inline QFixed &operator+=(int i) { val += (i<<6); return *this; } inline QFixed &operator+=(uint i) { val += (i<<6); return *this; } inline QFixed &operator+=(const QFixed &other) { val += other.val; return *this; } - inline QFixed operator-(int i) const { QFixed f; f.val = (val - (i<<6)); return f; } - inline QFixed operator-(uint i) const { QFixed f; f.val = (val - (i<<6)); return f; } - inline QFixed operator-(const QFixed &other) const { QFixed f; f.val = (val - other.val); return f; } + Q_DECL_CONSTEXPR inline QFixed operator-(int i) const { return fromFixed((val - (i<<6))); } + Q_DECL_CONSTEXPR inline QFixed operator-(uint i) const { return fromFixed((val - (i<<6))); } + Q_DECL_CONSTEXPR inline QFixed operator-(const QFixed &other) const { return fromFixed((val - other.val)); } inline QFixed &operator-=(int i) { val -= (i<<6); return *this; } inline QFixed &operator-=(uint i) { val -= (i<<6); return *this; } inline QFixed &operator-=(const QFixed &other) { val -= other.val; return *this; } - inline QFixed operator-() const { QFixed f; f.val = -val; return f; } + Q_DECL_CONSTEXPR inline QFixed operator-() const { return fromFixed(-val); } - inline bool operator==(const QFixed &other) const { return val == other.val; } - inline bool operator!=(const QFixed &other) const { return val != other.val; } - inline bool operator<(const QFixed &other) const { return val < other.val; } - inline bool operator>(const QFixed &other) const { return val > other.val; } - inline bool operator<=(const QFixed &other) const { return val <= other.val; } - inline bool operator>=(const QFixed &other) const { return val >= other.val; } - inline bool operator!() const { return !val; } + Q_DECL_CONSTEXPR inline bool operator==(const QFixed &other) const { return val == other.val; } + Q_DECL_CONSTEXPR inline bool operator!=(const QFixed &other) const { return val != other.val; } + Q_DECL_CONSTEXPR inline bool operator<(const QFixed &other) const { return val < other.val; } + Q_DECL_CONSTEXPR inline bool operator>(const QFixed &other) const { return val > other.val; } + Q_DECL_CONSTEXPR inline bool operator<=(const QFixed &other) const { return val <= other.val; } + Q_DECL_CONSTEXPR inline bool operator>=(const QFixed &other) const { return val >= other.val; } + Q_DECL_CONSTEXPR inline bool operator!() const { return !val; } inline QFixed &operator/=(int x) { val /= x; return *this; } inline QFixed &operator/=(const QFixed &o) { @@ -120,7 +122,7 @@ public: } return *this; } - inline QFixed operator/(int d) const { QFixed f; f.val = val/d; return f; } + Q_DECL_CONSTEXPR inline QFixed operator/(int d) const { return fromFixed(val/d); } inline QFixed operator/(QFixed b) const { QFixed f = *this; return (f /= b); } inline QFixed operator>>(int d) const { QFixed f = *this; f.val >>= d; return f; } inline QFixed &operator*=(int i) { val *= i; return *this; } @@ -136,50 +138,50 @@ public: val = neg ? -res : res; return *this; } - inline QFixed operator*(int i) const { QFixed f = *this; return (f *= i); } - inline QFixed operator*(uint i) const { QFixed f = *this; return (f *= i); } + Q_DECL_CONSTEXPR inline QFixed operator*(int i) const { return fromFixed(val * i); } + Q_DECL_CONSTEXPR inline QFixed operator*(uint i) const { return fromFixed(val * i); } inline QFixed operator*(const QFixed &o) const { QFixed f = *this; return (f *= o); } private: - QFixed(qreal i) : val((int)(i*qreal(64))) {} + Q_DECL_CONSTEXPR QFixed(qreal i) : val((int)(i*qreal(64))) {} QFixed &operator=(qreal i) { val = (int)(i*qreal(64)); return *this; } - inline QFixed operator+(qreal i) const { QFixed f; f.val = (val + (int)(i*qreal(64))); return f; } + Q_DECL_CONSTEXPR inline QFixed operator+(qreal i) const { return fromFixed((val + (int)(i*qreal(64)))); } inline QFixed &operator+=(qreal i) { val += (int)(i*64); return *this; } - inline QFixed operator-(qreal i) const { QFixed f; f.val = (val - (int)(i*qreal(64))); return f; } + Q_DECL_CONSTEXPR inline QFixed operator-(qreal i) const { return fromFixed((val - (int)(i*qreal(64)))); } inline QFixed &operator-=(qreal i) { val -= (int)(i*64); return *this; } inline QFixed &operator/=(qreal r) { val = (int)(val/r); return *this; } - inline QFixed operator/(qreal d) const { QFixed f; f.val = (int)(val/d); return f; } + Q_DECL_CONSTEXPR inline QFixed operator/(qreal d) const { return fromFixed((int)(val/d)); } inline QFixed &operator*=(qreal d) { val = (int) (val*d); return *this; } - inline QFixed operator*(qreal d) const { QFixed f = *this; return (f *= d); } + Q_DECL_CONSTEXPR inline QFixed operator*(qreal d) const { return fromFixed((int) (val*d)); } int val; }; Q_DECLARE_TYPEINFO(QFixed, Q_PRIMITIVE_TYPE); #define QFIXED_MAX (INT_MAX/256) -inline int qRound(const QFixed &f) { return f.toInt(); } -inline int qFloor(const QFixed &f) { return f.floor().truncate(); } - -inline QFixed operator*(int i, const QFixed &d) { return d*i; } -inline QFixed operator+(int i, const QFixed &d) { return d+i; } -inline QFixed operator-(int i, const QFixed &d) { return -(d-i); } -inline QFixed operator*(uint i, const QFixed &d) { return d*i; } -inline QFixed operator+(uint i, const QFixed &d) { return d+i; } -inline QFixed operator-(uint i, const QFixed &d) { return -(d-i); } -// inline QFixed operator*(qreal d, const QFixed &d2) { return d2*d; } - -inline bool operator==(const QFixed &f, int i) { return f.value() == (i<<6); } -inline bool operator==(int i, const QFixed &f) { return f.value() == (i<<6); } -inline bool operator!=(const QFixed &f, int i) { return f.value() != (i<<6); } -inline bool operator!=(int i, const QFixed &f) { return f.value() != (i<<6); } -inline bool operator<=(const QFixed &f, int i) { return f.value() <= (i<<6); } -inline bool operator<=(int i, const QFixed &f) { return (i<<6) <= f.value(); } -inline bool operator>=(const QFixed &f, int i) { return f.value() >= (i<<6); } -inline bool operator>=(int i, const QFixed &f) { return (i<<6) >= f.value(); } -inline bool operator<(const QFixed &f, int i) { return f.value() < (i<<6); } -inline bool operator<(int i, const QFixed &f) { return (i<<6) < f.value(); } -inline bool operator>(const QFixed &f, int i) { return f.value() > (i<<6); } -inline bool operator>(int i, const QFixed &f) { return (i<<6) > f.value(); } +Q_DECL_CONSTEXPR inline int qRound(const QFixed &f) { return f.toInt(); } +Q_DECL_CONSTEXPR inline int qFloor(const QFixed &f) { return f.floor().truncate(); } + +Q_DECL_CONSTEXPR inline QFixed operator*(int i, const QFixed &d) { return d*i; } +Q_DECL_CONSTEXPR inline QFixed operator+(int i, const QFixed &d) { return d+i; } +Q_DECL_CONSTEXPR inline QFixed operator-(int i, const QFixed &d) { return -(d-i); } +Q_DECL_CONSTEXPR inline QFixed operator*(uint i, const QFixed &d) { return d*i; } +Q_DECL_CONSTEXPR inline QFixed operator+(uint i, const QFixed &d) { return d+i; } +Q_DECL_CONSTEXPR inline QFixed operator-(uint i, const QFixed &d) { return -(d-i); } +// Q_DECL_CONSTEXPR inline QFixed operator*(qreal d, const QFixed &d2) { return d2*d; } + +Q_DECL_CONSTEXPR inline bool operator==(const QFixed &f, int i) { return f.value() == (i<<6); } +Q_DECL_CONSTEXPR inline bool operator==(int i, const QFixed &f) { return f.value() == (i<<6); } +Q_DECL_CONSTEXPR inline bool operator!=(const QFixed &f, int i) { return f.value() != (i<<6); } +Q_DECL_CONSTEXPR inline bool operator!=(int i, const QFixed &f) { return f.value() != (i<<6); } +Q_DECL_CONSTEXPR inline bool operator<=(const QFixed &f, int i) { return f.value() <= (i<<6); } +Q_DECL_CONSTEXPR inline bool operator<=(int i, const QFixed &f) { return (i<<6) <= f.value(); } +Q_DECL_CONSTEXPR inline bool operator>=(const QFixed &f, int i) { return f.value() >= (i<<6); } +Q_DECL_CONSTEXPR inline bool operator>=(int i, const QFixed &f) { return (i<<6) >= f.value(); } +Q_DECL_CONSTEXPR inline bool operator<(const QFixed &f, int i) { return f.value() < (i<<6); } +Q_DECL_CONSTEXPR inline bool operator<(int i, const QFixed &f) { return (i<<6) < f.value(); } +Q_DECL_CONSTEXPR inline bool operator>(const QFixed &f, int i) { return f.value() > (i<<6); } +Q_DECL_CONSTEXPR inline bool operator>(int i, const QFixed &f) { return (i<<6) > f.value(); } #ifndef QT_NO_DEBUG_STREAM inline QDebug &operator<<(QDebug &dbg, const QFixed &f) @@ -189,29 +191,28 @@ inline QDebug &operator<<(QDebug &dbg, const QFixed &f) struct QFixedPoint { QFixed x; QFixed y; - inline QFixedPoint() {} - inline QFixedPoint(const QFixed &_x, const QFixed &_y) : x(_x), y(_y) {} - QPointF toPointF() const { return QPointF(x.toReal(), y.toReal()); } - static QFixedPoint fromPointF(const QPointF &p) { + Q_DECL_CONSTEXPR inline QFixedPoint() {} + Q_DECL_CONSTEXPR inline QFixedPoint(const QFixed &_x, const QFixed &_y) : x(_x), y(_y) {} + Q_DECL_CONSTEXPR QPointF toPointF() const { return QPointF(x.toReal(), y.toReal()); } + Q_DECL_CONSTEXPR static QFixedPoint fromPointF(const QPointF &p) { return QFixedPoint(QFixed::fromReal(p.x()), QFixed::fromReal(p.y())); } }; Q_DECLARE_TYPEINFO(QFixedPoint, Q_PRIMITIVE_TYPE); -inline QFixedPoint operator-(const QFixedPoint &p1, const QFixedPoint &p2) +Q_DECL_CONSTEXPR inline QFixedPoint operator-(const QFixedPoint &p1, const QFixedPoint &p2) { return QFixedPoint(p1.x - p2.x, p1.y - p2.y); } -inline QFixedPoint operator+(const QFixedPoint &p1, const QFixedPoint &p2) +Q_DECL_CONSTEXPR inline QFixedPoint operator+(const QFixedPoint &p1, const QFixedPoint &p2) { return QFixedPoint(p1.x + p2.x, p1.y + p2.y); } struct QFixedSize { QFixed width; QFixed height; - QSizeF toSizeF() const { return QSizeF(width.toReal(), height.toReal()); } - static QFixedSize fromSizeF(const QSizeF &s) { - QFixedSize size; - size.width = QFixed::fromReal(s.width()); - size.height = QFixed::fromReal(s.height()); - return size; + Q_DECL_CONSTEXPR QFixedSize() {} + Q_DECL_CONSTEXPR QFixedSize(QFixed _width, QFixed _height) : width(_width), height(_height) {} + Q_DECL_CONSTEXPR QSizeF toSizeF() const { return QSizeF(width.toReal(), height.toReal()); } + Q_DECL_CONSTEXPR static QFixedSize fromSizeF(const QSizeF &s) { + return QFixedSize(QFixed::fromReal(s.width()), QFixed::fromReal(s.height())); } }; Q_DECLARE_TYPEINFO(QFixedSize, Q_PRIMITIVE_TYPE); diff --git a/src/gui/painting/qpen.cpp b/src/gui/painting/qpen.cpp index b6966b12c3..8d05eb56ff 100644 --- a/src/gui/painting/qpen.cpp +++ b/src/gui/painting/qpen.cpp @@ -985,7 +985,6 @@ QDataStream &operator>>(QDataStream &s, QPen &p) #ifndef QT_NO_DEBUG_STREAM QDebug operator<<(QDebug dbg, const QPen &p) { -#ifndef Q_BROKEN_DEBUG_STREAM const char *PEN_STYLES[] = { "NoPen", "SolidLine", @@ -1002,11 +1001,6 @@ QDebug operator<<(QDebug dbg, const QPen &p) << ',' << p.dashOffset() << ',' << p.miterLimit() << ')'; return dbg.space(); -#else - qWarning("This compiler doesn't support streaming QPen to QDebug"); - return dbg; - Q_UNUSED(p); -#endif } #endif diff --git a/src/gui/painting/qpolygon.cpp b/src/gui/painting/qpolygon.cpp index 3a4860a559..ee1f7967cb 100644 --- a/src/gui/painting/qpolygon.cpp +++ b/src/gui/painting/qpolygon.cpp @@ -468,17 +468,11 @@ QRect QPolygon::boundingRect() const #ifndef QT_NO_DEBUG_STREAM QDebug operator<<(QDebug dbg, const QPolygon &a) { -#ifndef Q_BROKEN_DEBUG_STREAM dbg.nospace() << "QPolygon("; for (int i = 0; i < a.count(); ++i) dbg.nospace() << a.at(i); dbg.nospace() << ')'; return dbg.space(); -#else - qWarning("This compiler doesn't support streaming QPolygon to QDebug"); - return dbg; - Q_UNUSED(a); -#endif } #endif @@ -814,17 +808,11 @@ QDataStream &operator>>(QDataStream &s, QPolygonF &a) #ifndef QT_NO_DEBUG_STREAM QDebug operator<<(QDebug dbg, const QPolygonF &a) { -#ifndef Q_BROKEN_DEBUG_STREAM dbg.nospace() << "QPolygonF("; for (int i = 0; i < a.count(); ++i) dbg.nospace() << a.at(i); dbg.nospace() << ')'; return dbg.space(); -#else - qWarning("This compiler doesn't support streaming QPolygonF to QDebug"); - return dbg; - Q_UNUSED(a); -#endif } #endif diff --git a/src/gui/text/qabstracttextdocumentlayout.cpp b/src/gui/text/qabstracttextdocumentlayout.cpp index 7bf2a631ea..86de48b1dc 100644 --- a/src/gui/text/qabstracttextdocumentlayout.cpp +++ b/src/gui/text/qabstracttextdocumentlayout.cpp @@ -239,7 +239,7 @@ QT_BEGIN_NAMESPACE /*! \fn int QAbstractTextDocumentLayout::hitTest(const QPointF &point, Qt::HitTestAccuracy accuracy) const - Returns the cursor postion for the given \a point with the specified + Returns the cursor position for the given \a point with the specified \a accuracy. Returns -1 if no valid cursor position was found. */ diff --git a/src/gui/text/qcssparser.cpp b/src/gui/text/qcssparser.cpp index 38070458b7..fd01934eae 100644 --- a/src/gui/text/qcssparser.cpp +++ b/src/gui/text/qcssparser.cpp @@ -1272,11 +1272,9 @@ void ValueExtractor::extractFont() extractFont(&f, &dummy); } -bool ValueExtractor::extractImage(QIcon *icon, Qt::Alignment *a, QSize *size) +bool ValueExtractor::extractImage(QCss::IconValue *icon, Qt::Alignment *a, QSize *size) { bool hit = false; -#if 0 - // ### Qt5 for (int i = 0; i < declarations.count(); ++i) { const Declaration &decl = declarations.at(i); switch (decl.d->propertyId) { @@ -1297,7 +1295,6 @@ bool ValueExtractor::extractImage(QIcon *icon, Qt::Alignment *a, QSize *size) } hit = true; } -#endif return hit; } @@ -1646,30 +1643,27 @@ void Declaration::borderImageValue(QString *image, int *cuts, *h = *v; } -#if 0 -// ### Qt 5 -QIcon Declaration::iconValue() const +IconValue Declaration::iconValue() const { if (d->parsed.isValid()) - return qvariant_cast<QIcon>(d->parsed); + return qvariant_cast<IconValue>(d->parsed); - QIcon icon; + IconValue icon; for (int i = 0; i < d->values.count();) { const Value &value = d->values.at(i++); if (value.type != Value::Uri) break; - QString uri = value.variant.toString(); - QIcon::Mode mode = QIcon::Normal; - QIcon::State state = QIcon::Off; + IconValue::IconEntry entry; + entry.uri = value.variant.toString(); for (int j = 0; j < 2; j++) { if (i != d->values.count() && d->values.at(i).type == Value::KnownIdentifier) { switch (d->values.at(i).variant.toInt()) { - case Value_Disabled: mode = QIcon::Disabled; break; - case Value_Active: mode = QIcon::Active; break; - case Value_Selected: mode = QIcon::Selected; break; - case Value_Normal: mode = QIcon::Normal; break; - case Value_On: state = QIcon::On; break; - case Value_Off: state = QIcon::Off; break; + case Value_Disabled: entry.mode = IconValue::Disabled; break; + case Value_Active: entry.mode = IconValue::Active; break; + case Value_Selected: entry.mode = IconValue::Selected; break; + case Value_Normal: entry.mode = IconValue::Normal; break; + case Value_On: entry.state = IconValue::On; break; + case Value_Off: entry.state = IconValue::Off; break; default: break; } ++i; @@ -1677,12 +1671,7 @@ QIcon Declaration::iconValue() const break; } } - - // QIcon is soo broken - if (icon.isNull()) - icon = QIcon(uri); - else - icon.addPixmap(uri, mode, state); + icon.entries.push_back(entry); if (i == d->values.count()) break; @@ -1691,10 +1680,9 @@ QIcon Declaration::iconValue() const i++; } - d->parsed = QVariant::fromValue<QIcon>(icon); + d->parsed = QVariant::fromValue<QCss::IconValue>(icon); return icon; } -#endif /////////////////////////////////////////////////////////////////////////////// // Selector diff --git a/src/gui/text/qcssparser_p.h b/src/gui/text/qcssparser_p.h index d50b87dcd5..b19fd8326e 100644 --- a/src/gui/text/qcssparser_p.h +++ b/src/gui/text/qcssparser_p.h @@ -411,6 +411,22 @@ struct BorderData { BrushData color; }; +struct Q_GUI_EXPORT IconValue +{ + enum Mode { Normal, Disabled, Active, Selected }; // In sync with QIcon. + enum State { On, Off }; + + struct Q_GUI_EXPORT IconEntry + { + IconEntry() : mode(Normal) , state(On) {} + + Mode mode; + State state; + QString uri; + }; + + QList<IconEntry> entries; +}; // 1. StyleRule - x:hover, y:clicked > z:checked { prop1: value1; prop2: value2; } // 2. QVector<Selector> - x:hover, y:clicked z:checked @@ -455,7 +471,7 @@ struct Q_GUI_EXPORT Declaration QSize sizeValue() const; QRect rectValue() const; QString uriValue() const; -// QIcon iconValue() const; + IconValue iconValue() const; void borderImageValue(QString *image, int *cuts, TileMode *h, TileMode *v) const; }; @@ -582,7 +598,7 @@ struct Q_GUI_EXPORT ValueExtractor bool extractOutline(int *borders, QBrush *colors, BorderStyle *Styles, QSize *radii, int *offsets); bool extractPalette(QBrush *fg, QBrush *sfg, QBrush *sbg, QBrush *abg); int extractStyleFeatures(); - bool extractImage(QIcon *icon, Qt::Alignment *a, QSize *size); + bool extractImage(QCss::IconValue *icon, Qt::Alignment *a, QSize *size); int lengthValue(const Declaration &decl); @@ -842,6 +858,7 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE( QCss::BackgroundData ) Q_DECLARE_METATYPE( QCss::LengthData ) Q_DECLARE_METATYPE( QCss::BorderData ) +Q_DECLARE_METATYPE( QCss::IconValue ) #endif // QT_NO_CSSPARSER diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp index bc7f4f7ad6..c63f0fede8 100644 --- a/src/gui/text/qtextengine.cpp +++ b/src/gui/text/qtextengine.cpp @@ -115,7 +115,20 @@ private: return; const int end = start + length; for (int i = start + 1; i < end; ++i) { - if ((m_analysis[i] == m_analysis[start]) + // According to the unicode spec we should be treating characters in the Common script + // (punctuation, spaces, etc) as being the same script as the surrounding text for the + // purpose of splitting up text. This is important because, for example, a fullstop + // (0x2E) can be used to indicate an abbreviation and so must be treated as part of a + // word. Thus it must be passed along with the word in languages that have to calculate + // word breaks. For example the thai word "ครม." has no word breaks but the word "ครม" + // does. + // Unfortuntely because we split up the strings for both wordwrapping and for setting + // the font and because Japanese and Chinese are also aliases of the script "Common", + // doing this would break too many things. So instead we only pass the full stop + // along, and nothing else. + if (m_analysis[i].bidiLevel == m_analysis[start].bidiLevel + && m_analysis[i].flags == m_analysis[start].flags + && (m_analysis[i].script == m_analysis[start].script || m_string[i] == QLatin1Char('.')) && m_analysis[i].flags < QScriptAnalysis::SpaceTabOrObject && i - start < MaxItemLength) continue; @@ -2689,6 +2702,8 @@ int QTextEngine::positionInLigature(const QScriptItem *si, int end, QFixed glyphWidth = glyphs.effectiveAdvance(glyph_pos); // the approximate width of each individual element of the ligature QFixed perItemWidth = glyphWidth / clusterLength; + if (perItemWidth <= 0) + return si->position + clusterStart; QFixed left = x > edge ? edge : edge - glyphWidth; int n = ((x - left) / perItemWidth).floor().toInt(); QFixed dist = x - left - n * perItemWidth; |