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/core/file_picker_controller.h | |
| 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/core/file_picker_controller.h')
| -rw-r--r-- | src/core/file_picker_controller.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/core/file_picker_controller.h b/src/core/file_picker_controller.h index 045134b30..851dec174 100644 --- a/src/core/file_picker_controller.h +++ b/src/core/file_picker_controller.h @@ -37,12 +37,14 @@ #ifndef FILE_PICKER_CONTROLLER_H #define FILE_PICKER_CONTROLLER_H +#include "qtwebenginecoreglobal.h" +#include <QObject> + namespace content { class WebContents; } -#include "qtwebenginecoreglobal.h" -#include <QObject> +namespace QtWebEngineCore { class QWEBENGINE_EXPORT FilePickerController : public QObject { Q_OBJECT @@ -74,4 +76,6 @@ private: }; +} // namespace + #endif // FILE_PICKER_CONTROLLER_H |