diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/content_client_qt.cpp | 17 | ||||
| -rw-r--r-- | src/core/doc/src/qtwebenginecore-module.qdoc | 10 | ||||
| -rw-r--r-- | src/core/gyp_run.pro | 1 | ||||
| -rw-r--r-- | src/webengine/doc/src/qtwebengine-index.qdoc | 23 | ||||
| -rw-r--r-- | src/webengine/doc/src/qtwebengine-platform-notes.qdoc | 30 | ||||
| -rw-r--r-- | src/webengine/doc/src/qtwebengine-qmlmodule.qdoc | 10 | ||||
| -rw-r--r-- | src/webenginewidgets/api/qwebenginehistory.cpp | 5 | ||||
| -rw-r--r-- | src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc | 6 |
8 files changed, 69 insertions, 33 deletions
diff --git a/src/core/content_client_qt.cpp b/src/core/content_client_qt.cpp index 01e1fe383..1d4923c70 100644 --- a/src/core/content_client_qt.cpp +++ b/src/core/content_client_qt.cpp @@ -107,10 +107,19 @@ void AddPepperFlashFromSystem(std::vector<content::PepperPluginInfo>* plugins) { QStringList pluginPaths; #if defined(Q_OS_WIN) && defined(Q_PROCESSOR_X86_32) - QDir pluginDir("C:/Windows/SysWOW64/Macromed/Flash"); - pluginDir.setFilter(QDir::Files); - QStringList nameFilters("pepflashplayer*.dll"); - pluginPaths << pluginDir.entryList(nameFilters); + QString winDir = QDir::fromNativeSeparators(qgetenv("WINDIR")); + if (winDir.isEmpty()) + winDir = QString::fromLatin1("C:/Windows"); + + const QStringList pluginDirs = { winDir + "/SysWOW64/Macromed/Flash", + winDir + "/System32/Macromed/Flash" }; + const QStringList nameFilters("pepflashplayer*.dll"); + Q_FOREACH (const QString &dirPath, pluginDirs) { + QDir pluginDir(dirPath); + pluginDir.setFilter(QDir::Files); + Q_FOREACH (const QFileInfo &info, pluginDir.entryInfoList(nameFilters)) + pluginPaths << info.absoluteFilePath(); + } #endif #if defined(Q_OS_OSX) pluginPaths << "/Library/Internet Plug-Ins/PepperFlashPlayer/PepperFlashPlayer.plugin"; // Mac OS X diff --git a/src/core/doc/src/qtwebenginecore-module.qdoc b/src/core/doc/src/qtwebenginecore-module.qdoc index 750a0244e..d0224c834 100644 --- a/src/core/doc/src/qtwebenginecore-module.qdoc +++ b/src/core/doc/src/qtwebenginecore-module.qdoc @@ -39,6 +39,12 @@ \snippet qtwebenginecore_build_snippet.qdoc 1 If you use qmake to build your projects, Qt WebEngine Core is usually - indirectly included through the \l[QtWebEngine]{Qt WebEngine} or - \l[QtWebEngineWidgets]{Qt WebEngine Widgets} modules. + indirectly included through the \l{Qt WebEngine QML Types}{Qt WebEngine} or + \l{Qt WebEngine Widgets C++ Classes}{Qt WebEngine Widgets} modules. + + To link against the module, add this line to your qmake project file: + + \snippet qtwebenginecore_build_snippet.qdoc 0 + + However, \c webenginecore is implied by adding \c webengine or \c webenginewidgets. */ diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro index def7d4698..79e1dca64 100644 --- a/src/core/gyp_run.pro +++ b/src/core/gyp_run.pro @@ -83,6 +83,7 @@ contains(QT_ARCH, "arm") { contains(QT_ARCH, "x86_64"): GYP_CONFIG += target_arch=x64 contains(QT_ARCH, "i386"): GYP_CONFIG += target_arch=ia32 +contains(QT_ARCH, "arm64"): GYP_CONFIG += target_arch=arm64 contains(WEBENGINE_CONFIG, use_proprietary_codecs): GYP_CONFIG += proprietary_codecs=1 ffmpeg_branding=Chrome diff --git a/src/webengine/doc/src/qtwebengine-index.qdoc b/src/webengine/doc/src/qtwebengine-index.qdoc index 671425e75..e30976ef3 100644 --- a/src/webengine/doc/src/qtwebengine-index.qdoc +++ b/src/webengine/doc/src/qtwebengine-index.qdoc @@ -42,29 +42,6 @@ \annotatedlist qtwebengine-qmlmodules - \section1 Getting Started - - To include the definitions of the Qt WebEngineCore and Qt WebEngineWidgets modules' classes, use - the following directives: - - \badcode - #include <QtWebEngineCore> - #include <QtWebEngineWidgets> - \endcode - - To import the Qt WebEngine module's QML types, add the following import statement to your .qml - file: - - \badcode - import QtWebEngine 1.2 - \endcode - - To link against the modules, add QT variables to your qmake .pro file: - - \badcode - QT += webengine webenginecore webenginewidgets - \endcode - \section1 Articles and Guides \list diff --git a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc index fdaa4f861..0898a72fc 100644 --- a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc +++ b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc @@ -49,4 +49,34 @@ \li Linux: Clang or GCC version 4.7 or later \li OS X: Xcode version 5.1 or later \endlist + + \section1 Adobe Flash Player Plugin Support + + Qt WebEngine supports the Adobe Flash player plugin that is a Pepper Plugin API (PPAPI) + plugin. The plugin must be installed in one of the following locations, depending on the + platform: + + \list + \li Windows + \code + C:\Windows\SysWOW64\Macromed\Flash\pepflashplayer*.dll + C:\Windows\System32\Macromed\Flash\pepflashplayer*.dll + \endcode + \li OS X + \code + /Library/Internet Plug-Ins/PepperFlashPlayer/PepperFlashPlayer.plugin + \endcode + \li Linux + \code + /usr/lib/pepperflashplugin-nonfree/libpepflashplayer.so + /usr/lib/PepperFlash/libpepflashplayer.so + /usr/lib64/chromium/PepperFlash/libpepflashplayer.so + \endcode + \endlist + + You can also load the Flash player from a specific location by using command line arguments: + + \code + --ppapi-flash-path=./libpepflashplayer.so + \endcode */ diff --git a/src/webengine/doc/src/qtwebengine-qmlmodule.qdoc b/src/webengine/doc/src/qtwebengine-qmlmodule.qdoc index e098071b3..89ff6f0b3 100644 --- a/src/webengine/doc/src/qtwebengine-qmlmodule.qdoc +++ b/src/webengine/doc/src/qtwebengine-qmlmodule.qdoc @@ -33,7 +33,13 @@ your .qml file: \badcode - import QtQuick 2.0 - import QtWebEngine 1.1 + import QtWebEngine 1.2 + \endcode + + To link against the module, add the following QT variable to your qmake .pro + file: + + \badcode + QT += webengine \endcode */ diff --git a/src/webenginewidgets/api/qwebenginehistory.cpp b/src/webenginewidgets/api/qwebenginehistory.cpp index 9aed2aca9..05efb131d 100644 --- a/src/webenginewidgets/api/qwebenginehistory.cpp +++ b/src/webenginewidgets/api/qwebenginehistory.cpp @@ -42,6 +42,11 @@ QT_BEGIN_NAMESPACE +/*! + \fn QWebEngineHistoryItem::swap(QWebEngineHistoryItem &other) + Swaps the history item with the \a other item. +*/ + QWebEngineHistoryItemPrivate::QWebEngineHistoryItemPrivate(QWebEnginePagePrivate *page, int index) : page(page) , index(index) diff --git a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc index 17dd15630..a6f015434 100644 --- a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc +++ b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc @@ -540,9 +540,11 @@ /*! \property QWebEnginePage::requestedUrl - \brief the URL requested to be loaded by the frame currently viewed + \brief the URL that was originally requested to be loaded by the frame + that is currently viewed - The URL may differ from the one returned by url() if a DNS resolution or a redirection occurs. + \note The URL may differ from the one returned by url(), which is the actual + URL that results from DNS resolution or redirection. \sa url(), setUrl() */ |