diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2017-04-06 10:05:55 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-04-07 18:17:58 +0000 |
| commit | 928cd15d3d3ab82734f49eb9d694faf59c3a0c6d (patch) | |
| tree | b4ccd30048fc23f59c8f156d6a0d1060b7121f16 /Source/WebKit | |
| parent | be770ca621f6463339b7d15be088e1b9acd851e5 (diff) | |
Import WebKit commit 342c7c7c069db3ca1d09ae6c5f7d600f9b241778
Change-Id: I8886595114569f61168aed76b23ad7288c5cb34c
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/WebKit')
| -rw-r--r-- | Source/WebKit/PlatformQt.cmake | 13 | ||||
| -rw-r--r-- | Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp | 3 |
2 files changed, 10 insertions, 6 deletions
diff --git a/Source/WebKit/PlatformQt.cmake b/Source/WebKit/PlatformQt.cmake index 82fc4595a..68909de95 100644 --- a/Source/WebKit/PlatformQt.cmake +++ b/Source/WebKit/PlatformQt.cmake @@ -378,6 +378,7 @@ install( ${WebKit_PUBLIC_HEADERS} DESTINATION ${KDE_INSTALL_INCLUDEDIR}/QtWebKit + COMPONENT Data ) file(GLOB WebKit_PRIVATE_HEADERS qt/Api/*_p.h) @@ -386,6 +387,7 @@ install( ${WebKit_PRIVATE_HEADERS} DESTINATION ${KDE_INSTALL_INCLUDEDIR}/QtWebKit/${PROJECT_VERSION}/QtWebKit/private + COMPONENT Data ) set(WEBKIT_PKGCONGIG_DEPS "Qt5Core Qt5Gui Qt5Network") @@ -435,8 +437,9 @@ ecm_generate_pkgconfig_file( BASE_NAME Qt5WebKit DEPS "${WEBKIT_PKGCONGIG_DEPS}" FILENAME_VAR WebKit_PKGCONFIG_FILENAME - INSTALL ) +set(ECM_PKGCONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/pkgconfig" CACHE PATH "The directory where pkgconfig will be installed to.") +install(FILES ${WebKit_PKGCONFIG_FILENAME} DESTINATION ${ECM_PKGCONFIG_INSTALL_DIR} COMPONENT Data) if (KDE_INSTALL_USE_QT_SYS_PATHS) set(WebKit_PRI_ARGUMENTS @@ -463,7 +466,7 @@ ecm_generate_pri_file( FILENAME_VAR WebKit_PRI_FILENAME ${WebKit_PRI_ARGUMENTS} ) -install(FILES ${WebKit_PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) +install(FILES ${WebKit_PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR} COMPONENT Data) if (QT_STATIC_BUILD) set(WebKit_LIBRARY_TYPE STATIC) @@ -586,6 +589,7 @@ install( ${WebKitWidgets_PUBLIC_HEADERS} DESTINATION ${KDE_INSTALL_INCLUDEDIR}/QtWebKitWidgets + COMPONENT Data ) file(GLOB WebKitWidgets_PRIVATE_HEADERS qt/WidgetApi/*_p.h) @@ -594,14 +598,15 @@ install( ${WebKitWidgets_PRIVATE_HEADERS} DESTINATION ${KDE_INSTALL_INCLUDEDIR}/QtWebKitWidgets/${PROJECT_VERSION}/QtWebKitWidgets/private + COMPONENT Data ) ecm_generate_pkgconfig_file( BASE_NAME Qt5WebKitWidgets DEPS "${WEBKITWIDGETS_PKGCONFIG_DEPS}" FILENAME_VAR WebKitWidgets_PKGCONFIG_FILENAME - INSTALL ) +install(FILES ${WebKitWidgets_PKGCONFIG_FILENAME} DESTINATION ${ECM_PKGCONFIG_INSTALL_DIR} COMPONENT Data) if (KDE_INSTALL_USE_QT_SYS_PATHS) set(WebKitWidgets_PRI_ARGUMENTS @@ -627,7 +632,7 @@ ecm_generate_pri_file( FILENAME_VAR WebKitWidgets_PRI_FILENAME ${WebKitWidgets_PRI_ARGUMENTS} ) -install(FILES ${WebKitWidgets_PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) +install(FILES ${WebKitWidgets_PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR} COMPONENT Data) if (MSVC) if (CMAKE_SIZEOF_VOID_P EQUAL 8) diff --git a/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp b/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp index a6d0267af..569cc541e 100644 --- a/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp +++ b/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp @@ -896,8 +896,7 @@ QList<MenuItem> descriptionForPlatformMenu(const Vector<ContextMenuItem>& items, QList<MenuItem> itemDescriptions; if (!items.size()) return itemDescriptions; - for (int i = 0; i < items.size(); ++i) { - const ContextMenuItem &item = items.at(i); + for (const auto& item : items) { MenuItem description; switch (item.type()) { case WebCore::CheckableActionType: /* fall through */ |