diff options
author | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
commit | 6630937e63ae5797487b86743a7733c8ae5cc42c (patch) | |
tree | 3d53dacf6430f9099e1fb20835881205de674961 /src/platformheaders | |
parent | 37ed6dae00640f9cc980ffda05347c12a7eb5d7e (diff) | |
parent | c7af193d2e49e9f10b86262e63d8d13abf72b5cf (diff) |
Merge commit 'dev' into 'wip/cmake-merge'
Change-Id: I176c40d031be26a1dd1cf08843e448a660598783
Diffstat (limited to 'src/platformheaders')
10 files changed, 228 insertions, 2 deletions
diff --git a/src/platformheaders/doc/qtplatformheaders.qdocconf b/src/platformheaders/doc/qtplatformheaders.qdocconf index 1ff6fe7a21..9a034e7671 100644 --- a/src/platformheaders/doc/qtplatformheaders.qdocconf +++ b/src/platformheaders/doc/qtplatformheaders.qdocconf @@ -35,5 +35,7 @@ sourcedirs += .. exampledirs += snippets imagedirs += images +tagfile = qtplatformheaders.tags + navigation.landingpage = "Qt Platform Headers" navigation.cppclassespage = "Qt Platform Headers C++ Classes" diff --git a/src/platformheaders/eglfsfunctions/qeglfsfunctions.h b/src/platformheaders/eglfsfunctions/qeglfsfunctions.h index 7165c3cff4..869fe7ce3f 100644 --- a/src/platformheaders/eglfsfunctions/qeglfsfunctions.h +++ b/src/platformheaders/eglfsfunctions/qeglfsfunctions.h @@ -49,7 +49,9 @@ class QEglFSFunctions { public: typedef void (*LoadKeymapType)(const QString &filename); + typedef void (*SwitchLangType)(); static QByteArray loadKeymapTypeIdentifier() { return QByteArrayLiteral("EglFSLoadKeymap"); } + static QByteArray switchLangTypeIdentifier() { return QByteArrayLiteral("EglFSSwitchLang"); } static void loadKeymap(const QString &filename) { @@ -58,6 +60,13 @@ public: func(filename); } + static void switchLang() + { + SwitchLangType func = reinterpret_cast<SwitchLangType>(QGuiApplication::platformFunction(switchLangTypeIdentifier())); + if (func) + func(); + } + typedef int (*Vsp2AddLayerType)(const QScreen *screen, int dmabufFd, const QSize &size, const QPoint &position, uint drmPixelFormat, uint bytesPerLine); static QByteArray vsp2AddLayerTypeIdentifier() { return QByteArrayLiteral("EglFSVsp2AddLayer"); } diff --git a/src/platformheaders/eglfsfunctions/qeglfsfunctions.qdoc b/src/platformheaders/eglfsfunctions/qeglfsfunctions.qdoc index 0bee9190cf..a5f37f8377 100644 --- a/src/platformheaders/eglfsfunctions/qeglfsfunctions.qdoc +++ b/src/platformheaders/eglfsfunctions/qeglfsfunctions.qdoc @@ -67,6 +67,21 @@ */ /*! + \fn void QEglFSFunctions::switchLang() + + Switches between English and other language when the keymap is loaded. + Usually the keymap contains two languages: English and national. When + you load the keymap, English is selected by default. This function allows + to switch between these languages. + + \note This is functional only when the evdev keyboard support code is + compiled in to the platform plugin. When using external generic plugins via + the \c{-plugin} argument, or when the environment variable + \c{QT_QPA_EGLFS_DISABLE_INPUT} is set or when building Qt without evdev + support, this function will have no effect. +*/ + +/*! \fn int QEglFSFunctions::vsp2AddLayer(const QScreen *screen, int dmabufFd, const QSize &size, const QPoint &position, uint drmPixelFormat, uint bytesPerLine) \internal \preliminary diff --git a/src/platformheaders/linuxfbfunctions/linuxfbfunctions.pri b/src/platformheaders/linuxfbfunctions/linuxfbfunctions.pri new file mode 100644 index 0000000000..8a092c3049 --- /dev/null +++ b/src/platformheaders/linuxfbfunctions/linuxfbfunctions.pri @@ -0,0 +1 @@ +HEADERS += $$PWD/qlinuxfbfunctions.h diff --git a/src/platformheaders/linuxfbfunctions/qlinuxfbfunctions.h b/src/platformheaders/linuxfbfunctions/qlinuxfbfunctions.h new file mode 100644 index 0000000000..94c4c24270 --- /dev/null +++ b/src/platformheaders/linuxfbfunctions/qlinuxfbfunctions.h @@ -0,0 +1,74 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the plugins of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QLINUXFBFUNCTIONS_H +#define QLINUXFBFUNCTIONS_H + +#include <QtCore/QByteArray> +#include <QtGui/QGuiApplication> + +QT_BEGIN_NAMESPACE + +class QLinuxFbFunctions +{ +public: + typedef void (*LoadKeymapType)(const QString &filename); + typedef void (*SwitchLangType)(); + static QByteArray loadKeymapTypeIdentifier() { return QByteArrayLiteral("LinuxFbLoadKeymap"); } + static QByteArray switchLangTypeIdentifier() { return QByteArrayLiteral("LinuxFbSwitchLang"); } + + static void loadKeymap(const QString &filename) + { + LoadKeymapType func = reinterpret_cast<LoadKeymapType>(QGuiApplication::platformFunction(loadKeymapTypeIdentifier())); + if (func) + func(filename); + } + + static void switchLang() + { + SwitchLangType func = reinterpret_cast<SwitchLangType>(QGuiApplication::platformFunction(switchLangTypeIdentifier())); + if (func) + func(); + } +}; + + +QT_END_NAMESPACE + +#endif // QLINUXFBFUNCTIONS_H diff --git a/src/platformheaders/linuxfbfunctions/qlinuxfbfunctions.qdoc b/src/platformheaders/linuxfbfunctions/qlinuxfbfunctions.qdoc new file mode 100644 index 0000000000..939aa76946 --- /dev/null +++ b/src/platformheaders/linuxfbfunctions/qlinuxfbfunctions.qdoc @@ -0,0 +1,82 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \class QLinuxFbFunctions + \inmodule QtPlatformHeaders + + \brief The QLinuxFbFunctions class is an inline class containing + platform-specific functionality for the linuxfb platform plugin that is + typically used on systems running Embedded Linux or Android. + + \note There is no binary compatibility guarantee for this class, + meaning that an application using it is only guaranteed to work with the Qt + version it was developed against. +*/ + +/*! + \typedef QLinuxFbFunctions::LoadKeymapType + + Function type for loadKeymap. +*/ + +/*! + \fn QByteArray QLinuxFbFunctions::loadKeymapTypeIdentifier() + + \return the identifier that can be passed to + QGuiApplication::platformFunction() to query the entry point for the + loadKeymap function implementation. +*/ + +/*! + \fn void QLinuxFbFunctions::loadKeymap(const QString &filename) + + Loads and switches to the keymap from \a filename. When \a filename is + empty, the default keymap, which is either the built-on one or the keymap + given in the plugin specification, is restored. + + \note This is functional only when the evdev keyboard support code is + compiled in to the platform plugin. When using external generic plugins via + the \c{-plugin} argument, or when the environment variable + \c{QT_QPA_FB_DISABLE_INPUT} is set or when building Qt without evdev + support, this function will have no effect. +*/ + +/*! + \fn void QLinuxFbFunctions::switchLang() + + Switches between English and other language when the keymap is loaded. + Usually the keymap contains two languages: English and national. When + you load the keymap, English is selected by default. This function allows + to switch between these languages. + + \note This is functional only when the evdev keyboard support code is + compiled in to the platform plugin. When using external generic plugins via + the \c{-plugin} argument, or when the environment variable + \c{QT_QPA_FB_DISABLE_INPUT} is set or when building Qt without evdev + support, this function will have no effect. +*/ diff --git a/src/platformheaders/nativecontexts/qeglnativecontext.h b/src/platformheaders/nativecontexts/qeglnativecontext.h index d4a0e998da..5af2b304fe 100644 --- a/src/platformheaders/nativecontexts/qeglnativecontext.h +++ b/src/platformheaders/nativecontexts/qeglnativecontext.h @@ -54,8 +54,8 @@ typedef int EGLDisplay; struct QEGLNativeContext { QEGLNativeContext() - : m_context(0), - m_display(0) + : m_context(nullptr), + m_display(nullptr) { } QEGLNativeContext(EGLContext ctx, EGLDisplay dpy) diff --git a/src/platformheaders/platformheaders.pro b/src/platformheaders/platformheaders.pro index caaa67a486..392acc54f0 100644 --- a/src/platformheaders/platformheaders.pro +++ b/src/platformheaders/platformheaders.pro @@ -10,6 +10,7 @@ include(windowsfunctions/windowsfunctions.pri) include(helper/helper.pri) include(cocoafunctions/cocoafunctions.pri) include(waylandfunctions/waylandfunctions.pri) +include(linuxfbfunctions/linuxfbfunctions.pri) QMAKE_DOCS = $$PWD/doc/qtplatformheaders.qdocconf diff --git a/src/platformheaders/windowsfunctions/qwindowswindowfunctions.h b/src/platformheaders/windowsfunctions/qwindowswindowfunctions.h index e51c2fde67..032dcafa6e 100644 --- a/src/platformheaders/windowsfunctions/qwindowswindowfunctions.h +++ b/src/platformheaders/windowsfunctions/qwindowswindowfunctions.h @@ -81,6 +81,15 @@ public: func(window, border); } + typedef void (*SetHasBorderInFullScreenDefault)(bool border); + static const QByteArray setHasBorderInFullScreenDefaultIdentifier() { return QByteArrayLiteral("WindowsSetHasBorderInFullScreenDefault"); } + static void setHasBorderInFullScreenDefault(bool border) + { + auto func = reinterpret_cast<SetHasBorderInFullScreenDefault>(QGuiApplication::platformFunction(setHasBorderInFullScreenDefaultIdentifier())); + if (func) + func(border); + } + typedef void (*SetWindowActivationBehaviorType)(WindowActivationBehavior); static const QByteArray setWindowActivationBehaviorIdentifier() { return QByteArrayLiteral("WindowsSetWindowActivationBehavior"); } diff --git a/src/platformheaders/windowsfunctions/qwindowswindowfunctions.qdoc b/src/platformheaders/windowsfunctions/qwindowswindowfunctions.qdoc index a52bbe061b..0c52cde753 100644 --- a/src/platformheaders/windowsfunctions/qwindowswindowfunctions.qdoc +++ b/src/platformheaders/windowsfunctions/qwindowswindowfunctions.qdoc @@ -93,7 +93,40 @@ is true then it will enable the WS_BORDER flag in full screen mode to enable other top level windows inside the application to appear on top when required. + \note The setting must be applied before showing the window or switching it + to full screen. For QML, setHasBorderInFullScreenDefault() can be used to + set a default value. + + See also \l [QtDoc] {Fullscreen OpenGL Based Windows} +*/ + +/*! + \typedef QWindowsWindowFunctions::SetHasBorderInFullScreenDefault + \since 5.13 + + This is the typedef for the function returned by QGuiApplication::platformFunction + when passed setHasBorderInFullScreenDefaultIdentifier. +*/ + +/*! + \fn QByteArray QWindowsWindowFunctions::setHasBorderInFullScreenDefaultIdentifier() + \since 5.13 + + This function returns the bytearray that can be used to query + QGuiApplication::platformFunction to retrieve the SetHasBorderInFullScreen function. +*/ + +/*! + \fn void QWindowsWindowFunctions::setHasBorderInFullScreenDefault(bool border) + \since 5.13 + + This is a convenience function that can be used directly instead of resolving + the function pointer. \a border will be relayed to the function retrieved by + QGuiApplication. When \a border is true, the WS_BORDER flag will be set + in full screen mode for all windows by default. + See also \l [QtDoc] {Fullscreen OpenGL Based Windows} + \sa setHasBorderInFullScreen() */ /*! |