diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-03-12 15:51:11 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-03-13 10:13:37 +0100 |
| commit | 6e356d55c8eabcc96223e25182458b78378dd5a4 (patch) | |
| tree | c13b6a0c52a253966ae588c2252b33d5f8392a60 /src/webengine/ui_delegates_manager.cpp | |
| parent | f4c03d68cff2b107fe19dfe210e0207215c04f2d (diff) | |
| parent | 2cf54e48922a7d379fb7e212966d05bc402e475d (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/webengine/api/qquickwebengineview_p_p.h
src/webengine/ui_delegates_manager.cpp
src/webengine/ui_delegates_manager.h
src/webenginewidgets/api/qwebenginepage_p.h
Change-Id: I8052de4d3b2e68a950832226f6f99e2aafca5505
Diffstat (limited to 'src/webengine/ui_delegates_manager.cpp')
| -rw-r--r-- | src/webengine/ui_delegates_manager.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/webengine/ui_delegates_manager.cpp b/src/webengine/ui_delegates_manager.cpp index ed51bd8f2..44c763f37 100644 --- a/src/webengine/ui_delegates_manager.cpp +++ b/src/webengine/ui_delegates_manager.cpp @@ -52,6 +52,8 @@ // Uncomment for QML debugging //#define UI_DELEGATES_DEBUG +namespace QtWebEngineCore { + #define NO_SEPARATOR #if defined(Q_OS_WIN) #define FILE_NAME_CASE_STATEMENT(TYPE, COMPONENT) \ @@ -387,3 +389,5 @@ void UIDelegatesManager::showFilePicker(FilePickerController *controller) QMetaObject::invokeMethod(filePicker, "open"); } + +} // namespace QtWebEngineCore |