diff options
author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-11-19 17:55:49 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-28 16:15:59 +0100 |
commit | fd61d752e313bf91a09c85020b3fb50067c610c8 (patch) | |
tree | 5aeff0a1039acc3e7bf7ced21870cac42d491f9e | |
parent | 84a400e80d7e40aba2853411fdfb22f244c3e728 (diff) |
Moving sources to src part 1: Move files.
This only move files without adjusting any paths.
This moves:
- lib/quick -> src/webengine/api (API files)
lib/quick -> src/webengine (other files)
This contains the main QtWebEngine module library since
<ec7b2ee70a8b2db7fb87f50671a001ddd54697b0>.
- lib/widgets -> src/webenginewidgets
Also rename this directory to match its module name and rename Api to api.
- lib -> src/core
- process -> src/process
- resources -> src/core/resources
- tools/* -> tools/scripts/
The build directory is spread as follow:
- build/build.pro -> src/core/gyp_run.pro
- build/qmake_extras/* -> src/core/ (for the host and target .pro files)
- build/qmake -> tools/qmake
- Build related scripts -> tools/buildscripts
Change-Id: I0cded1de772c99c0c1da6536c9afea353236b4a1
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
-rw-r--r-- | .gitmodules | 2 | ||||
-rw-r--r-- | build/qmake_extras/qmake_extras.pro | 6 | ||||
-rw-r--r-- | qtwebengine.gyp | 11 | ||||
m--------- | src/3rdparty (renamed from 3rdparty) | 0 | ||||
-rw-r--r-- | src/core/backing_store_qt.cpp (renamed from lib/backing_store_qt.cpp) | 0 | ||||
-rw-r--r-- | src/core/backing_store_qt.h (renamed from lib/backing_store_qt.h) | 0 | ||||
-rw-r--r-- | src/core/browser_context_qt.h (renamed from lib/browser_context_qt.h) | 0 | ||||
-rw-r--r-- | src/core/chromium_gpu_helper.cpp (renamed from lib/chromium_gpu_helper.cpp) | 0 | ||||
-rw-r--r-- | src/core/chromium_gpu_helper.h (renamed from lib/chromium_gpu_helper.h) | 0 | ||||
-rw-r--r-- | src/core/chromium_overrides.cpp (renamed from lib/chromium_overrides.cpp) | 0 | ||||
-rw-r--r-- | src/core/chromium_overrides.h (renamed from lib/chromium_overrides.h) | 0 | ||||
-rw-r--r-- | src/core/content_browser_client_qt.cpp (renamed from lib/content_browser_client_qt.cpp) | 0 | ||||
-rw-r--r-- | src/core/content_browser_client_qt.h (renamed from lib/content_browser_client_qt.h) | 0 | ||||
-rw-r--r-- | src/core/content_client_qt.cpp (renamed from lib/content_client_qt.cpp) | 0 | ||||
-rw-r--r-- | src/core/content_client_qt.h (renamed from lib/content_client_qt.h) | 0 | ||||
-rw-r--r-- | src/core/core_gyp_generator.pro (renamed from lib/lib.pro) | 0 | ||||
-rw-r--r-- | src/core/core_resources.qrc (renamed from lib/lib_resources.qrc) | 0 | ||||
-rw-r--r-- | src/core/delegated_frame_node.cpp (renamed from lib/delegated_frame_node.cpp) | 0 | ||||
-rw-r--r-- | src/core/delegated_frame_node.h (renamed from lib/delegated_frame_node.h) | 0 | ||||
-rw-r--r-- | src/core/dev_tools_http_handler_delegate_qt.cpp (renamed from lib/dev_tools_http_handler_delegate_qt.cpp) | 0 | ||||
-rw-r--r-- | src/core/dev_tools_http_handler_delegate_qt.h (renamed from lib/dev_tools_http_handler_delegate_qt.h) | 0 | ||||
-rw-r--r-- | src/core/devtools.qrc (renamed from lib/devtools.qrc) | 0 | ||||
-rw-r--r-- | src/core/download_manager_delegate_qt.cpp (renamed from lib/download_manager_delegate_qt.cpp) | 0 | ||||
-rw-r--r-- | src/core/download_manager_delegate_qt.h (renamed from lib/download_manager_delegate_qt.h) | 0 | ||||
-rw-r--r-- | src/core/gyp_configure_host.pro (renamed from build/qmake_extras/host/host.pro) | 0 | ||||
-rw-r--r-- | src/core/gyp_configure_target.pro (renamed from build/qmake_extras/target/target.pro) | 0 | ||||
-rw-r--r-- | src/core/gyp_run.pro (renamed from build/build.pro) | 0 | ||||
-rw-r--r-- | src/core/javascript_dialog_manager_qt.cpp (renamed from lib/javascript_dialog_manager_qt.cpp) | 0 | ||||
-rw-r--r-- | src/core/javascript_dialog_manager_qt.h (renamed from lib/javascript_dialog_manager_qt.h) | 0 | ||||
-rw-r--r-- | src/core/network_delegate_qt.cpp (renamed from lib/network_delegate_qt.cpp) | 0 | ||||
-rw-r--r-- | src/core/network_delegate_qt.h (renamed from lib/network_delegate_qt.h) | 0 | ||||
-rw-r--r-- | src/core/process_main.cpp (renamed from lib/process_main.cpp) | 0 | ||||
-rw-r--r-- | src/core/process_main.h (renamed from lib/process_main.h) | 0 | ||||
-rw-r--r-- | src/core/qtwebengine.gypi (renamed from qtwebengine.gypi) | 0 | ||||
-rw-r--r-- | src/core/qtwebengine_extras.gypi (renamed from build/qtwebengine_extras.gypi) | 0 | ||||
-rw-r--r-- | src/core/qtwebenginecoreglobal.h (renamed from lib/qtwebenginecoreglobal.h) | 0 | ||||
-rw-r--r-- | src/core/render_widget_host_view_qt.cpp (renamed from lib/render_widget_host_view_qt.cpp) | 0 | ||||
-rw-r--r-- | src/core/render_widget_host_view_qt.h (renamed from lib/render_widget_host_view_qt.h) | 0 | ||||
-rw-r--r-- | src/core/render_widget_host_view_qt_delegate.h (renamed from lib/render_widget_host_view_qt_delegate.h) | 0 | ||||
-rw-r--r-- | src/core/resource_bundle_qt.cpp (renamed from lib/resource_bundle_qt.cpp) | 0 | ||||
-rw-r--r-- | src/core/resource_context_qt.cpp (renamed from lib/resource_context_qt.cpp) | 0 | ||||
-rw-r--r-- | src/core/resource_context_qt.h (renamed from lib/resource_context_qt.h) | 0 | ||||
-rw-r--r-- | src/core/resources/devtools_discovery_page.html (renamed from resources/devtools_discovery_page.html) | 0 | ||||
-rw-r--r-- | src/core/resources/resources.pro (renamed from resources/resources.pro) | 0 | ||||
-rw-r--r-- | src/core/type_conversion.h (renamed from lib/type_conversion.h) | 0 | ||||
-rw-r--r-- | src/core/url_request_context_getter_qt.cpp (renamed from lib/url_request_context_getter_qt.cpp) | 0 | ||||
-rw-r--r-- | src/core/url_request_context_getter_qt.h (renamed from lib/url_request_context_getter_qt.h) | 0 | ||||
-rw-r--r-- | src/core/web_contents_adapter.cpp (renamed from lib/web_contents_adapter.cpp) | 0 | ||||
-rw-r--r-- | src/core/web_contents_adapter.h (renamed from lib/web_contents_adapter.h) | 0 | ||||
-rw-r--r-- | src/core/web_contents_adapter_client.h (renamed from lib/web_contents_adapter_client.h) | 0 | ||||
-rw-r--r-- | src/core/web_contents_delegate_qt.cpp (renamed from lib/web_contents_delegate_qt.cpp) | 0 | ||||
-rw-r--r-- | src/core/web_contents_delegate_qt.h (renamed from lib/web_contents_delegate_qt.h) | 0 | ||||
-rw-r--r-- | src/core/web_contents_view_qt.cpp (renamed from lib/web_contents_view_qt.cpp) | 0 | ||||
-rw-r--r-- | src/core/web_contents_view_qt.h (renamed from lib/web_contents_view_qt.h) | 0 | ||||
-rw-r--r-- | src/core/web_engine_context.cpp (renamed from lib/web_engine_context.cpp) | 0 | ||||
-rw-r--r-- | src/core/web_engine_context.h (renamed from lib/web_engine_context.h) | 0 | ||||
-rw-r--r-- | src/core/web_event_factory.cpp (renamed from lib/web_event_factory.cpp) | 0 | ||||
-rw-r--r-- | src/core/web_event_factory.h (renamed from lib/web_event_factory.h) | 0 | ||||
-rw-r--r-- | src/core/yuv_video_node.cpp (renamed from lib/yuv_video_node.cpp) | 0 | ||||
-rw-r--r-- | src/core/yuv_video_node.h (renamed from lib/yuv_video_node.h) | 0 | ||||
-rw-r--r-- | src/process/main.cpp (renamed from process/main.cpp) | 0 | ||||
-rw-r--r-- | src/process/process.pro (renamed from process/process.pro) | 0 | ||||
-rw-r--r-- | src/src.pro (renamed from qtwebengine.pro) | 0 | ||||
-rw-r--r-- | src/webengine/api/qquickwebengineview.cpp (renamed from lib/quick/qquickwebengineview.cpp) | 0 | ||||
-rw-r--r-- | src/webengine/api/qquickwebengineview_p.h (renamed from lib/quick/qquickwebengineview_p.h) | 0 | ||||
-rw-r--r-- | src/webengine/api/qquickwebengineview_p_p.h (renamed from lib/quick/qquickwebengineview_p_p.h) | 0 | ||||
-rw-r--r-- | src/webengine/api/qtwebengineglobal.h (renamed from lib/quick/qtwebengineglobal.h) | 0 | ||||
-rw-r--r-- | src/webengine/api/qtwebengineglobal_p.h (renamed from lib/quick/qtwebengineglobal_p.h) | 0 | ||||
-rw-r--r-- | src/webengine/plugin/experimental/experimental.pro (renamed from lib/quick/plugin/experimental/experimental.pro) | 0 | ||||
-rw-r--r-- | src/webengine/plugin/experimental/plugin.cpp (renamed from lib/quick/plugin/experimental/plugin.cpp) | 0 | ||||
-rw-r--r-- | src/webengine/plugin/experimental/qmldir (renamed from lib/quick/plugin/experimental/qmldir) | 0 | ||||
-rw-r--r-- | src/webengine/plugin/plugin.cpp (renamed from lib/quick/plugin/plugin.cpp) | 0 | ||||
-rw-r--r-- | src/webengine/plugin/plugin.pro (renamed from lib/quick/plugin/plugin.pro) | 0 | ||||
-rw-r--r-- | src/webengine/plugin/qmldir (renamed from lib/quick/plugin/qmldir) | 0 | ||||
-rw-r--r-- | src/webengine/render_widget_host_view_qt_delegate_quick.cpp (renamed from lib/quick/render_widget_host_view_qt_delegate_quick.cpp) | 0 | ||||
-rw-r--r-- | src/webengine/render_widget_host_view_qt_delegate_quick.h (renamed from lib/quick/render_widget_host_view_qt_delegate_quick.h) | 0 | ||||
-rw-r--r-- | src/webengine/webengine.pro (renamed from lib/quick/quick.pro) | 0 | ||||
-rw-r--r-- | src/webenginewidgets/api/qtwebenginewidgetsglobal.h (renamed from lib/widgets/Api/qtwebenginewidgetsglobal.h) | 0 | ||||
-rw-r--r-- | src/webenginewidgets/api/qwebenginehistory.cpp (renamed from lib/widgets/Api/qwebenginehistory.cpp) | 0 | ||||
-rw-r--r-- | src/webenginewidgets/api/qwebenginehistory.h (renamed from lib/widgets/Api/qwebenginehistory.h) | 0 | ||||
-rw-r--r-- | src/webenginewidgets/api/qwebenginehistory_p.h (renamed from lib/widgets/Api/qwebenginehistory_p.h) | 0 | ||||
-rw-r--r-- | src/webenginewidgets/api/qwebenginehistoryinterface.h (renamed from lib/widgets/Api/qwebenginehistoryinterface.h) | 0 | ||||
-rw-r--r-- | src/webenginewidgets/api/qwebengineinspector.h (renamed from lib/widgets/Api/qwebengineinspector.h) | 0 | ||||
-rw-r--r-- | src/webenginewidgets/api/qwebenginepage.cpp (renamed from lib/widgets/Api/qwebenginepage.cpp) | 0 | ||||
-rw-r--r-- | src/webenginewidgets/api/qwebenginepage.h (renamed from lib/widgets/Api/qwebenginepage.h) | 0 | ||||
-rw-r--r-- | src/webenginewidgets/api/qwebenginepage_p.h (renamed from lib/widgets/Api/qwebenginepage_p.h) | 0 | ||||
-rw-r--r-- | src/webenginewidgets/api/qwebenginesecurityorigin.h (renamed from lib/widgets/Api/qwebenginesecurityorigin.h) | 0 | ||||
-rw-r--r-- | src/webenginewidgets/api/qwebenginesettings.h (renamed from lib/widgets/Api/qwebenginesettings.h) | 0 | ||||
-rw-r--r-- | src/webenginewidgets/api/qwebengineview.cpp (renamed from lib/widgets/Api/qwebengineview.cpp) | 0 | ||||
-rw-r--r-- | src/webenginewidgets/api/qwebengineview.h (renamed from lib/widgets/Api/qwebengineview.h) | 0 | ||||
-rw-r--r-- | src/webenginewidgets/api/qwebengineview_p.h (renamed from lib/widgets/Api/qwebengineview_p.h) | 0 | ||||
-rw-r--r-- | src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp (renamed from lib/widgets/render_widget_host_view_qt_delegate_widget.cpp) | 0 | ||||
-rw-r--r-- | src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h (renamed from lib/widgets/render_widget_host_view_qt_delegate_widget.h) | 0 | ||||
-rw-r--r-- | src/webenginewidgets/webenginewidgets.pro (renamed from lib/widgets/widgets.pro) | 0 | ||||
-rwxr-xr-x | tools/buildscripts/build_resources.py (renamed from build/scripts/build_resources.py) | 0 | ||||
-rwxr-xr-x | tools/buildscripts/find-included-moc-files (renamed from build/scripts/find-included-moc-files) | 0 | ||||
-rwxr-xr-x | tools/buildscripts/find-mocables (renamed from build/scripts/find-mocables) | 0 | ||||
-rwxr-xr-x | tools/buildscripts/gyp_qtwebengine (renamed from build/gyp_qtwebengine) | 0 | ||||
-rw-r--r-- | tools/qmake/mkspecs/features/default_pre.prf (renamed from build/qmake/mkspecs/features/default_pre.prf) | 0 | ||||
-rw-r--r-- | tools/qmake/mkspecs/features/functions.prf (renamed from build/qmake/mkspecs/features/functions.prf) | 0 | ||||
-rw-r--r-- | tools/qmake/mkspecs/features/gyp_generator.prf (renamed from build/qmake/mkspecs/features/gyp_generator.prf) | 0 | ||||
-rw-r--r-- | tools/qmake/mkspecs/features/mac/default_post.prf (renamed from build/qmake/mkspecs/features/mac/default_post.prf) | 0 | ||||
-rw-r--r-- | tools/scripts/git_submodule.py (renamed from tools/git_submodule.py) | 0 | ||||
-rwxr-xr-x | tools/scripts/take_snapshot.py (renamed from tools/take_snapshot.py) | 0 |
104 files changed, 1 insertions, 18 deletions
diff --git a/.gitmodules b/.gitmodules index c9096a28b..a8bc30f42 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "3rdparty"] - path = 3rdparty + path = src/3rdparty url = git://gitorious.org/qt-labs/chromium.git ignore = all diff --git a/build/qmake_extras/qmake_extras.pro b/build/qmake_extras/qmake_extras.pro deleted file mode 100644 index 409993128..000000000 --- a/build/qmake_extras/qmake_extras.pro +++ /dev/null @@ -1,6 +0,0 @@ -TEMPLATE = subdirs - -CONFIG += ordered - -SUBDIRS = host \ - target diff --git a/qtwebengine.gyp b/qtwebengine.gyp deleted file mode 100644 index 0ddf816da..000000000 --- a/qtwebengine.gyp +++ /dev/null @@ -1,11 +0,0 @@ -{ - 'targets': [ - { - 'target_name': 'qtwebengine', - 'type': 'none', - 'dependencies': [ - 'lib/lib.gyp:*', - ], - } - ] -} diff --git a/3rdparty b/src/3rdparty -Subproject 9427c1a0222ebd67efef1a2c7990a0fa5c9aac8 +Subproject 9427c1a0222ebd67efef1a2c7990a0fa5c9aac8 diff --git a/lib/backing_store_qt.cpp b/src/core/backing_store_qt.cpp index b12f09f18..b12f09f18 100644 --- a/lib/backing_store_qt.cpp +++ b/src/core/backing_store_qt.cpp diff --git a/lib/backing_store_qt.h b/src/core/backing_store_qt.h index 24f232a02..24f232a02 100644 --- a/lib/backing_store_qt.h +++ b/src/core/backing_store_qt.h diff --git a/lib/browser_context_qt.h b/src/core/browser_context_qt.h index 382b08ff3..382b08ff3 100644 --- a/lib/browser_context_qt.h +++ b/src/core/browser_context_qt.h diff --git a/lib/chromium_gpu_helper.cpp b/src/core/chromium_gpu_helper.cpp index 3d393c25d..3d393c25d 100644 --- a/lib/chromium_gpu_helper.cpp +++ b/src/core/chromium_gpu_helper.cpp diff --git a/lib/chromium_gpu_helper.h b/src/core/chromium_gpu_helper.h index e0ac8e2a3..e0ac8e2a3 100644 --- a/lib/chromium_gpu_helper.h +++ b/src/core/chromium_gpu_helper.h diff --git a/lib/chromium_overrides.cpp b/src/core/chromium_overrides.cpp index 383fc6587..383fc6587 100644 --- a/lib/chromium_overrides.cpp +++ b/src/core/chromium_overrides.cpp diff --git a/lib/chromium_overrides.h b/src/core/chromium_overrides.h index cda4d7e66..cda4d7e66 100644 --- a/lib/chromium_overrides.h +++ b/src/core/chromium_overrides.h diff --git a/lib/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp index 9bc9bfe5e..9bc9bfe5e 100644 --- a/lib/content_browser_client_qt.cpp +++ b/src/core/content_browser_client_qt.cpp diff --git a/lib/content_browser_client_qt.h b/src/core/content_browser_client_qt.h index b97eaa5e1..b97eaa5e1 100644 --- a/lib/content_browser_client_qt.h +++ b/src/core/content_browser_client_qt.h diff --git a/lib/content_client_qt.cpp b/src/core/content_client_qt.cpp index 46a3e9870..46a3e9870 100644 --- a/lib/content_client_qt.cpp +++ b/src/core/content_client_qt.cpp diff --git a/lib/content_client_qt.h b/src/core/content_client_qt.h index 059e9423b..059e9423b 100644 --- a/lib/content_client_qt.h +++ b/src/core/content_client_qt.h diff --git a/lib/lib.pro b/src/core/core_gyp_generator.pro index 76924ecd4..76924ecd4 100644 --- a/lib/lib.pro +++ b/src/core/core_gyp_generator.pro diff --git a/lib/lib_resources.qrc b/src/core/core_resources.qrc index af8448d2b..af8448d2b 100644 --- a/lib/lib_resources.qrc +++ b/src/core/core_resources.qrc diff --git a/lib/delegated_frame_node.cpp b/src/core/delegated_frame_node.cpp index c770f388d..c770f388d 100644 --- a/lib/delegated_frame_node.cpp +++ b/src/core/delegated_frame_node.cpp diff --git a/lib/delegated_frame_node.h b/src/core/delegated_frame_node.h index b73370874..b73370874 100644 --- a/lib/delegated_frame_node.h +++ b/src/core/delegated_frame_node.h diff --git a/lib/dev_tools_http_handler_delegate_qt.cpp b/src/core/dev_tools_http_handler_delegate_qt.cpp index 0603f5dcc..0603f5dcc 100644 --- a/lib/dev_tools_http_handler_delegate_qt.cpp +++ b/src/core/dev_tools_http_handler_delegate_qt.cpp diff --git a/lib/dev_tools_http_handler_delegate_qt.h b/src/core/dev_tools_http_handler_delegate_qt.h index e866f0765..e866f0765 100644 --- a/lib/dev_tools_http_handler_delegate_qt.h +++ b/src/core/dev_tools_http_handler_delegate_qt.h diff --git a/lib/devtools.qrc b/src/core/devtools.qrc index 225f88f65..225f88f65 100644 --- a/lib/devtools.qrc +++ b/src/core/devtools.qrc diff --git a/lib/download_manager_delegate_qt.cpp b/src/core/download_manager_delegate_qt.cpp index 27b61b1c9..27b61b1c9 100644 --- a/lib/download_manager_delegate_qt.cpp +++ b/src/core/download_manager_delegate_qt.cpp diff --git a/lib/download_manager_delegate_qt.h b/src/core/download_manager_delegate_qt.h index 79f5de167..79f5de167 100644 --- a/lib/download_manager_delegate_qt.h +++ b/src/core/download_manager_delegate_qt.h diff --git a/build/qmake_extras/host/host.pro b/src/core/gyp_configure_host.pro index e99d1e7c5..e99d1e7c5 100644 --- a/build/qmake_extras/host/host.pro +++ b/src/core/gyp_configure_host.pro diff --git a/build/qmake_extras/target/target.pro b/src/core/gyp_configure_target.pro index 6d9f414c3..6d9f414c3 100644 --- a/build/qmake_extras/target/target.pro +++ b/src/core/gyp_configure_target.pro diff --git a/build/build.pro b/src/core/gyp_run.pro index e0c8b4af1..e0c8b4af1 100644 --- a/build/build.pro +++ b/src/core/gyp_run.pro diff --git a/lib/javascript_dialog_manager_qt.cpp b/src/core/javascript_dialog_manager_qt.cpp index b2f6d86bc..b2f6d86bc 100644 --- a/lib/javascript_dialog_manager_qt.cpp +++ b/src/core/javascript_dialog_manager_qt.cpp diff --git a/lib/javascript_dialog_manager_qt.h b/src/core/javascript_dialog_manager_qt.h index de416e03e..de416e03e 100644 --- a/lib/javascript_dialog_manager_qt.h +++ b/src/core/javascript_dialog_manager_qt.h diff --git a/lib/network_delegate_qt.cpp b/src/core/network_delegate_qt.cpp index 27807c499..27807c499 100644 --- a/lib/network_delegate_qt.cpp +++ b/src/core/network_delegate_qt.cpp diff --git a/lib/network_delegate_qt.h b/src/core/network_delegate_qt.h index 9413addb3..9413addb3 100644 --- a/lib/network_delegate_qt.h +++ b/src/core/network_delegate_qt.h diff --git a/lib/process_main.cpp b/src/core/process_main.cpp index af44ba600..af44ba600 100644 --- a/lib/process_main.cpp +++ b/src/core/process_main.cpp diff --git a/lib/process_main.h b/src/core/process_main.h index 2bd37a336..2bd37a336 100644 --- a/lib/process_main.h +++ b/src/core/process_main.h diff --git a/qtwebengine.gypi b/src/core/qtwebengine.gypi index f13e781f5..f13e781f5 100644 --- a/qtwebengine.gypi +++ b/src/core/qtwebengine.gypi diff --git a/build/qtwebengine_extras.gypi b/src/core/qtwebengine_extras.gypi index 2937ee423..2937ee423 100644 --- a/build/qtwebengine_extras.gypi +++ b/src/core/qtwebengine_extras.gypi diff --git a/lib/qtwebenginecoreglobal.h b/src/core/qtwebenginecoreglobal.h index b84c321d0..b84c321d0 100644 --- a/lib/qtwebenginecoreglobal.h +++ b/src/core/qtwebenginecoreglobal.h diff --git a/lib/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp index 91e9ab585..91e9ab585 100644 --- a/lib/render_widget_host_view_qt.cpp +++ b/src/core/render_widget_host_view_qt.cpp diff --git a/lib/render_widget_host_view_qt.h b/src/core/render_widget_host_view_qt.h index c0905ffeb..c0905ffeb 100644 --- a/lib/render_widget_host_view_qt.h +++ b/src/core/render_widget_host_view_qt.h diff --git a/lib/render_widget_host_view_qt_delegate.h b/src/core/render_widget_host_view_qt_delegate.h index 74151fdbf..74151fdbf 100644 --- a/lib/render_widget_host_view_qt_delegate.h +++ b/src/core/render_widget_host_view_qt_delegate.h diff --git a/lib/resource_bundle_qt.cpp b/src/core/resource_bundle_qt.cpp index 044d00511..044d00511 100644 --- a/lib/resource_bundle_qt.cpp +++ b/src/core/resource_bundle_qt.cpp diff --git a/lib/resource_context_qt.cpp b/src/core/resource_context_qt.cpp index ae5b989f0..ae5b989f0 100644 --- a/lib/resource_context_qt.cpp +++ b/src/core/resource_context_qt.cpp diff --git a/lib/resource_context_qt.h b/src/core/resource_context_qt.h index cd01b8aee..cd01b8aee 100644 --- a/lib/resource_context_qt.h +++ b/src/core/resource_context_qt.h diff --git a/resources/devtools_discovery_page.html b/src/core/resources/devtools_discovery_page.html index de848d348..de848d348 100644 --- a/resources/devtools_discovery_page.html +++ b/src/core/resources/devtools_discovery_page.html diff --git a/resources/resources.pro b/src/core/resources/resources.pro index a9404f3ec..a9404f3ec 100644 --- a/resources/resources.pro +++ b/src/core/resources/resources.pro diff --git a/lib/type_conversion.h b/src/core/type_conversion.h index 0f0a8ab60..0f0a8ab60 100644 --- a/lib/type_conversion.h +++ b/src/core/type_conversion.h diff --git a/lib/url_request_context_getter_qt.cpp b/src/core/url_request_context_getter_qt.cpp index 99bf68b1c..99bf68b1c 100644 --- a/lib/url_request_context_getter_qt.cpp +++ b/src/core/url_request_context_getter_qt.cpp diff --git a/lib/url_request_context_getter_qt.h b/src/core/url_request_context_getter_qt.h index ca56cb38e..ca56cb38e 100644 --- a/lib/url_request_context_getter_qt.h +++ b/src/core/url_request_context_getter_qt.h diff --git a/lib/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp index c09fc362a..c09fc362a 100644 --- a/lib/web_contents_adapter.cpp +++ b/src/core/web_contents_adapter.cpp diff --git a/lib/web_contents_adapter.h b/src/core/web_contents_adapter.h index f631b6d69..f631b6d69 100644 --- a/lib/web_contents_adapter.h +++ b/src/core/web_contents_adapter.h diff --git a/lib/web_contents_adapter_client.h b/src/core/web_contents_adapter_client.h index c7746ffb1..c7746ffb1 100644 --- a/lib/web_contents_adapter_client.h +++ b/src/core/web_contents_adapter_client.h diff --git a/lib/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp index 5a96d9be4..5a96d9be4 100644 --- a/lib/web_contents_delegate_qt.cpp +++ b/src/core/web_contents_delegate_qt.cpp diff --git a/lib/web_contents_delegate_qt.h b/src/core/web_contents_delegate_qt.h index 9e27c043f..9e27c043f 100644 --- a/lib/web_contents_delegate_qt.h +++ b/src/core/web_contents_delegate_qt.h diff --git a/lib/web_contents_view_qt.cpp b/src/core/web_contents_view_qt.cpp index e89bac7a2..e89bac7a2 100644 --- a/lib/web_contents_view_qt.cpp +++ b/src/core/web_contents_view_qt.cpp diff --git a/lib/web_contents_view_qt.h b/src/core/web_contents_view_qt.h index ee81ccc81..ee81ccc81 100644 --- a/lib/web_contents_view_qt.h +++ b/src/core/web_contents_view_qt.h diff --git a/lib/web_engine_context.cpp b/src/core/web_engine_context.cpp index e26027207..e26027207 100644 --- a/lib/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp diff --git a/lib/web_engine_context.h b/src/core/web_engine_context.h index cdd3e34b2..cdd3e34b2 100644 --- a/lib/web_engine_context.h +++ b/src/core/web_engine_context.h diff --git a/lib/web_event_factory.cpp b/src/core/web_event_factory.cpp index d750aa3e0..d750aa3e0 100644 --- a/lib/web_event_factory.cpp +++ b/src/core/web_event_factory.cpp diff --git a/lib/web_event_factory.h b/src/core/web_event_factory.h index e5ee91510..e5ee91510 100644 --- a/lib/web_event_factory.h +++ b/src/core/web_event_factory.h diff --git a/lib/yuv_video_node.cpp b/src/core/yuv_video_node.cpp index e6c0c7da9..e6c0c7da9 100644 --- a/lib/yuv_video_node.cpp +++ b/src/core/yuv_video_node.cpp diff --git a/lib/yuv_video_node.h b/src/core/yuv_video_node.h index 509ef40e6..509ef40e6 100644 --- a/lib/yuv_video_node.h +++ b/src/core/yuv_video_node.h diff --git a/process/main.cpp b/src/process/main.cpp index 800dbdcfa..800dbdcfa 100644 --- a/process/main.cpp +++ b/src/process/main.cpp diff --git a/process/process.pro b/src/process/process.pro index 6234d839f..6234d839f 100644 --- a/process/process.pro +++ b/src/process/process.pro diff --git a/qtwebengine.pro b/src/src.pro index bc0151536..bc0151536 100644 --- a/qtwebengine.pro +++ b/src/src.pro diff --git a/lib/quick/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index 4cfff0102..4cfff0102 100644 --- a/lib/quick/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp diff --git a/lib/quick/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h index 943ce0804..943ce0804 100644 --- a/lib/quick/qquickwebengineview_p.h +++ b/src/webengine/api/qquickwebengineview_p.h diff --git a/lib/quick/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h index e7c87ce1d..e7c87ce1d 100644 --- a/lib/quick/qquickwebengineview_p_p.h +++ b/src/webengine/api/qquickwebengineview_p_p.h diff --git a/lib/quick/qtwebengineglobal.h b/src/webengine/api/qtwebengineglobal.h index 46f77c55f..46f77c55f 100644 --- a/lib/quick/qtwebengineglobal.h +++ b/src/webengine/api/qtwebengineglobal.h diff --git a/lib/quick/qtwebengineglobal_p.h b/src/webengine/api/qtwebengineglobal_p.h index 1600dad63..1600dad63 100644 --- a/lib/quick/qtwebengineglobal_p.h +++ b/src/webengine/api/qtwebengineglobal_p.h diff --git a/lib/quick/plugin/experimental/experimental.pro b/src/webengine/plugin/experimental/experimental.pro index ad2e0b8a3..ad2e0b8a3 100644 --- a/lib/quick/plugin/experimental/experimental.pro +++ b/src/webengine/plugin/experimental/experimental.pro diff --git a/lib/quick/plugin/experimental/plugin.cpp b/src/webengine/plugin/experimental/plugin.cpp index 08d482508..08d482508 100644 --- a/lib/quick/plugin/experimental/plugin.cpp +++ b/src/webengine/plugin/experimental/plugin.cpp diff --git a/lib/quick/plugin/experimental/qmldir b/src/webengine/plugin/experimental/qmldir index 56ad22e70..56ad22e70 100644 --- a/lib/quick/plugin/experimental/qmldir +++ b/src/webengine/plugin/experimental/qmldir diff --git a/lib/quick/plugin/plugin.cpp b/src/webengine/plugin/plugin.cpp index 5efde6dd8..5efde6dd8 100644 --- a/lib/quick/plugin/plugin.cpp +++ b/src/webengine/plugin/plugin.cpp diff --git a/lib/quick/plugin/plugin.pro b/src/webengine/plugin/plugin.pro index 93e04f97a..93e04f97a 100644 --- a/lib/quick/plugin/plugin.pro +++ b/src/webengine/plugin/plugin.pro diff --git a/lib/quick/plugin/qmldir b/src/webengine/plugin/qmldir index e24f55ed9..e24f55ed9 100644 --- a/lib/quick/plugin/qmldir +++ b/src/webengine/plugin/qmldir diff --git a/lib/quick/render_widget_host_view_qt_delegate_quick.cpp b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp index 8d0f5f0cc..8d0f5f0cc 100644 --- a/lib/quick/render_widget_host_view_qt_delegate_quick.cpp +++ b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp diff --git a/lib/quick/render_widget_host_view_qt_delegate_quick.h b/src/webengine/render_widget_host_view_qt_delegate_quick.h index e8e073c24..e8e073c24 100644 --- a/lib/quick/render_widget_host_view_qt_delegate_quick.h +++ b/src/webengine/render_widget_host_view_qt_delegate_quick.h diff --git a/lib/quick/quick.pro b/src/webengine/webengine.pro index 50353066b..50353066b 100644 --- a/lib/quick/quick.pro +++ b/src/webengine/webengine.pro diff --git a/lib/widgets/Api/qtwebenginewidgetsglobal.h b/src/webenginewidgets/api/qtwebenginewidgetsglobal.h index d875c1cbe..d875c1cbe 100644 --- a/lib/widgets/Api/qtwebenginewidgetsglobal.h +++ b/src/webenginewidgets/api/qtwebenginewidgetsglobal.h diff --git a/lib/widgets/Api/qwebenginehistory.cpp b/src/webenginewidgets/api/qwebenginehistory.cpp index 2dd69dcff..2dd69dcff 100644 --- a/lib/widgets/Api/qwebenginehistory.cpp +++ b/src/webenginewidgets/api/qwebenginehistory.cpp diff --git a/lib/widgets/Api/qwebenginehistory.h b/src/webenginewidgets/api/qwebenginehistory.h index b8ea6b863..b8ea6b863 100644 --- a/lib/widgets/Api/qwebenginehistory.h +++ b/src/webenginewidgets/api/qwebenginehistory.h diff --git a/lib/widgets/Api/qwebenginehistory_p.h b/src/webenginewidgets/api/qwebenginehistory_p.h index 42f3ff73c..42f3ff73c 100644 --- a/lib/widgets/Api/qwebenginehistory_p.h +++ b/src/webenginewidgets/api/qwebenginehistory_p.h diff --git a/lib/widgets/Api/qwebenginehistoryinterface.h b/src/webenginewidgets/api/qwebenginehistoryinterface.h index b8108c516..b8108c516 100644 --- a/lib/widgets/Api/qwebenginehistoryinterface.h +++ b/src/webenginewidgets/api/qwebenginehistoryinterface.h diff --git a/lib/widgets/Api/qwebengineinspector.h b/src/webenginewidgets/api/qwebengineinspector.h index 9427b4e5c..9427b4e5c 100644 --- a/lib/widgets/Api/qwebengineinspector.h +++ b/src/webenginewidgets/api/qwebengineinspector.h diff --git a/lib/widgets/Api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp index 106e46949..106e46949 100644 --- a/lib/widgets/Api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp diff --git a/lib/widgets/Api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h index a613f4a27..a613f4a27 100644 --- a/lib/widgets/Api/qwebenginepage.h +++ b/src/webenginewidgets/api/qwebenginepage.h diff --git a/lib/widgets/Api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h index 0e654e6c9..0e654e6c9 100644 --- a/lib/widgets/Api/qwebenginepage_p.h +++ b/src/webenginewidgets/api/qwebenginepage_p.h diff --git a/lib/widgets/Api/qwebenginesecurityorigin.h b/src/webenginewidgets/api/qwebenginesecurityorigin.h index c943bec84..c943bec84 100644 --- a/lib/widgets/Api/qwebenginesecurityorigin.h +++ b/src/webenginewidgets/api/qwebenginesecurityorigin.h diff --git a/lib/widgets/Api/qwebenginesettings.h b/src/webenginewidgets/api/qwebenginesettings.h index 177a975fd..177a975fd 100644 --- a/lib/widgets/Api/qwebenginesettings.h +++ b/src/webenginewidgets/api/qwebenginesettings.h diff --git a/lib/widgets/Api/qwebengineview.cpp b/src/webenginewidgets/api/qwebengineview.cpp index 4dea036b1..4dea036b1 100644 --- a/lib/widgets/Api/qwebengineview.cpp +++ b/src/webenginewidgets/api/qwebengineview.cpp diff --git a/lib/widgets/Api/qwebengineview.h b/src/webenginewidgets/api/qwebengineview.h index 2c649d46f..2c649d46f 100644 --- a/lib/widgets/Api/qwebengineview.h +++ b/src/webenginewidgets/api/qwebengineview.h diff --git a/lib/widgets/Api/qwebengineview_p.h b/src/webenginewidgets/api/qwebengineview_p.h index 774386a21..774386a21 100644 --- a/lib/widgets/Api/qwebengineview_p.h +++ b/src/webenginewidgets/api/qwebengineview_p.h diff --git a/lib/widgets/render_widget_host_view_qt_delegate_widget.cpp b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp index 0d84a0f46..0d84a0f46 100644 --- a/lib/widgets/render_widget_host_view_qt_delegate_widget.cpp +++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp diff --git a/lib/widgets/render_widget_host_view_qt_delegate_widget.h b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h index 7ec91931f..7ec91931f 100644 --- a/lib/widgets/render_widget_host_view_qt_delegate_widget.h +++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h diff --git a/lib/widgets/widgets.pro b/src/webenginewidgets/webenginewidgets.pro index 3338e0cf7..3338e0cf7 100644 --- a/lib/widgets/widgets.pro +++ b/src/webenginewidgets/webenginewidgets.pro diff --git a/build/scripts/build_resources.py b/tools/buildscripts/build_resources.py index 7b20aa9ad..7b20aa9ad 100755 --- a/build/scripts/build_resources.py +++ b/tools/buildscripts/build_resources.py diff --git a/build/scripts/find-included-moc-files b/tools/buildscripts/find-included-moc-files index e55f3824c..e55f3824c 100755 --- a/build/scripts/find-included-moc-files +++ b/tools/buildscripts/find-included-moc-files diff --git a/build/scripts/find-mocables b/tools/buildscripts/find-mocables index 7c383cfec..7c383cfec 100755 --- a/build/scripts/find-mocables +++ b/tools/buildscripts/find-mocables diff --git a/build/gyp_qtwebengine b/tools/buildscripts/gyp_qtwebengine index e715cb821..e715cb821 100755 --- a/build/gyp_qtwebengine +++ b/tools/buildscripts/gyp_qtwebengine diff --git a/build/qmake/mkspecs/features/default_pre.prf b/tools/qmake/mkspecs/features/default_pre.prf index 1e751b740..1e751b740 100644 --- a/build/qmake/mkspecs/features/default_pre.prf +++ b/tools/qmake/mkspecs/features/default_pre.prf diff --git a/build/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf index 9d90d67bd..9d90d67bd 100644 --- a/build/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf diff --git a/build/qmake/mkspecs/features/gyp_generator.prf b/tools/qmake/mkspecs/features/gyp_generator.prf index d15b864c9..d15b864c9 100644 --- a/build/qmake/mkspecs/features/gyp_generator.prf +++ b/tools/qmake/mkspecs/features/gyp_generator.prf diff --git a/build/qmake/mkspecs/features/mac/default_post.prf b/tools/qmake/mkspecs/features/mac/default_post.prf index 2b9fed81b..2b9fed81b 100644 --- a/build/qmake/mkspecs/features/mac/default_post.prf +++ b/tools/qmake/mkspecs/features/mac/default_post.prf diff --git a/tools/git_submodule.py b/tools/scripts/git_submodule.py index 084bd2b1f..084bd2b1f 100644 --- a/tools/git_submodule.py +++ b/tools/scripts/git_submodule.py diff --git a/tools/take_snapshot.py b/tools/scripts/take_snapshot.py index 1a6976902..1a6976902 100755 --- a/tools/take_snapshot.py +++ b/tools/scripts/take_snapshot.py |