diff options
Diffstat (limited to 'src/gui/kernel')
-rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 10 | ||||
-rw-r--r-- | src/gui/kernel/qplatformclipboard.cpp | 3 |
2 files changed, 12 insertions, 1 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 85fc9f3893..6ac84c6cab 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -171,6 +171,7 @@ bool QGuiApplicationPrivate::noGrab = false; static qreal fontSmoothingGamma = 1.7; extern void qRegisterGuiVariant(); +extern void qRegisterGuiGetInterpolator(); extern void qInitDrawhelperAsm(); extern void qInitImageConversions(); @@ -489,6 +490,12 @@ static QWindowGeometrySpecification windowGeometrySpecification; \li \c{-platformtheme} \e platformTheme, specifies the platform theme. Overridden by the \c QT_QPA_PLATFORMTHEME environment variable. + + \li \c{-plugin} \e plugin, specifies additional plugins to load. The argument + may appear multiple times. + + Overridden by the \c QT_QPA_GENERIC_PLUGINS environment variable. + \li \c{-qmljsdebugger=}, activates the QML/JS debugger with a specified port. The value must be of format \c{port:1234}\e{[,block]}, where \e block is optional @@ -1284,6 +1291,9 @@ void QGuiApplicationPrivate::init() // trigger registering of QVariant's GUI types qRegisterGuiVariant(); + // trigger registering of animation interpolators + qRegisterGuiGetInterpolator(); + QWindowSystemInterfacePrivate::eventTime.start(); is_app_running = true; diff --git a/src/gui/kernel/qplatformclipboard.cpp b/src/gui/kernel/qplatformclipboard.cpp index 5c25054260..d93268c9f2 100644 --- a/src/gui/kernel/qplatformclipboard.cpp +++ b/src/gui/kernel/qplatformclipboard.cpp @@ -123,7 +123,8 @@ bool QPlatformClipboard::ownsMode(QClipboard::Mode mode) const void QPlatformClipboard::emitChanged(QClipboard::Mode mode) { - QGuiApplication::clipboard()->emitChanged(mode); + if (!QGuiApplicationPrivate::is_app_closing) // QTBUG-39317, prevent emission when closing down. + QGuiApplication::clipboard()->emitChanged(mode); } QT_END_NAMESPACE |