diff options
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/browser_context_adapter.cpp | 1 | ||||
-rw-r--r-- | src/core/content_client_qt.cpp | 19 | ||||
-rw-r--r-- | src/core/cookie_monster_delegate_qt.cpp | 2 | ||||
-rw-r--r-- | src/core/core_gyp_generator.pro | 1 | ||||
-rw-r--r-- | src/core/resources/resources.gyp | 6 | ||||
-rw-r--r-- | src/core/web_engine_library_info.cpp | 1 |
6 files changed, 9 insertions, 21 deletions
diff --git a/src/core/browser_context_adapter.cpp b/src/core/browser_context_adapter.cpp index 7b40688a1..0bbb13857 100644 --- a/src/core/browser_context_adapter.cpp +++ b/src/core/browser_context_adapter.cpp @@ -52,7 +52,6 @@ #include <QCoreApplication> #include <QDir> #include <QString> -#include <QStringBuilder> #include <QStandardPaths> #include <numeric> diff --git a/src/core/content_client_qt.cpp b/src/core/content_client_qt.cpp index 1d4923c70..ccc97517e 100644 --- a/src/core/content_client_qt.cpp +++ b/src/core/content_client_qt.cpp @@ -49,7 +49,6 @@ #include <QCoreApplication> #include <QFile> -#include <QStringBuilder> #if defined(ENABLE_PLUGINS) #include "content/public/common/pepper_plugin_info.h" @@ -106,20 +105,14 @@ content::PepperPluginInfo CreatePepperFlashInfo(const base::FilePath& path, cons void AddPepperFlashFromSystem(std::vector<content::PepperPluginInfo>* plugins) { QStringList pluginPaths; -#if defined(Q_OS_WIN) && defined(Q_PROCESSOR_X86_32) +#if defined(Q_OS_WIN) 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(); - } + QDir pluginDir(winDir + "/System32/Macromed/Flash"); + pluginDir.setFilter(QDir::Files); + Q_FOREACH (const QFileInfo &info, pluginDir.entryInfoList(QStringList("pepflashplayer*.dll"))) + pluginPaths << info.absoluteFilePath(); #endif #if defined(Q_OS_OSX) pluginPaths << "/Library/Internet Plug-Ins/PepperFlashPlayer/PepperFlashPlayer.plugin"; // Mac OS X @@ -133,7 +126,6 @@ void AddPepperFlashFromSystem(std::vector<content::PepperPluginInfo>* plugins) if (!QFile(*it).exists()) continue; plugins->push_back(CreatePepperFlashInfo(QtWebEngineCore::toFilePath(*it), std::string())); - return; } } @@ -160,7 +152,6 @@ void ContentClientQt::AddPepperPlugins(std::vector<content::PepperPluginInfo>* p #endif #include <QCoreApplication> -#include <QStringBuilder> namespace QtWebEngineCore { diff --git a/src/core/cookie_monster_delegate_qt.cpp b/src/core/cookie_monster_delegate_qt.cpp index e740d01e7..3689d54d7 100644 --- a/src/core/cookie_monster_delegate_qt.cpp +++ b/src/core/cookie_monster_delegate_qt.cpp @@ -44,8 +44,6 @@ #include "api/qwebenginecookiestore_p.h" #include "type_conversion.h" -#include <QStringBuilder> - namespace QtWebEngineCore { static GURL sourceUrlForCookie(const QNetworkCookie &cookie) { diff --git a/src/core/core_gyp_generator.pro b/src/core/core_gyp_generator.pro index 14b8d78e2..0685abd7e 100644 --- a/src/core/core_gyp_generator.pro +++ b/src/core/core_gyp_generator.pro @@ -11,6 +11,7 @@ include(core_common.pri) # Defining keywords such as 'signal' clashes with the chromium code base. DEFINES += QT_NO_KEYWORDS \ + QT_USE_QSTRINGBUILDER \ Q_FORWARD_DECLARE_OBJC_CLASS=QT_FORWARD_DECLARE_CLASS \ QTWEBENGINEPROCESS_NAME=\\\"$$QTWEBENGINEPROCESS_NAME\\\" \ QTWEBENGINECORE_VERSION_STR=\\\"$$MODULE_VERSION\\\" \ diff --git a/src/core/resources/resources.gyp b/src/core/resources/resources.gyp index 6293cdf3b..143f21f9d 100644 --- a/src/core/resources/resources.gyp +++ b/src/core/resources/resources.gyp @@ -77,15 +77,15 @@ ['qt_install_data != ""', { 'copies': [ { - 'destination': '<(qt_install_data)', + 'destination': '<(qt_install_data)/resources', 'files': [ '<(SHARED_INTERMEDIATE_DIR)/repack/qtwebengine_resources.pak' ], }, { - 'destination': '<(qt_install_data)', + 'destination': '<(qt_install_data)/resources', 'files': [ '<(SHARED_INTERMEDIATE_DIR)/repack/qtwebengine_resources_100p.pak' ], }, { - 'destination': '<(qt_install_data)', + 'destination': '<(qt_install_data)/resources', 'files': [ '<(SHARED_INTERMEDIATE_DIR)/repack/qtwebengine_resources_200p.pak' ], }, ], diff --git a/src/core/web_engine_library_info.cpp b/src/core/web_engine_library_info.cpp index 7b8858e44..a3c599208 100644 --- a/src/core/web_engine_library_info.cpp +++ b/src/core/web_engine_library_info.cpp @@ -52,7 +52,6 @@ #include <QLibraryInfo> #include <QStandardPaths> #include <QString> -#include <QStringBuilder> #ifndef QTWEBENGINEPROCESS_NAME #error "No name defined for QtWebEngine's process" |