Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 16:55:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #8853 from birarda/web-engine-interceptor

Browse source 
move HFWebEngineProfile to interface/networking
This commit is contained in:
Seth Alves 2016-10-18 20:28:58 -07:00 committed by GitHub
commit d0e1a69cc3
6 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/Application.cpp
View file

@ -67,7 +67,6 @@
#include <gpu/gl/GLBackend.h>
#include <HFActionEvent.h>
#include <HFBackEvent.h>
#include <HFWebEngineProfile.h>
#include <InfoView.h>
#include <input-plugins/InputPlugin.h>
#include <controllers/UserInputMapper.h>
@ -129,7 +128,7 @@
#include "InterfaceLogging.h"
#include "LODManager.h"
#include "ModelPackager.h"
#include "networking/HFWebEngineProfile.h"
#include "scripting/AccountScriptingInterface.h"
#include "scripting/AssetMappingsScriptingInterface.h"
#include "scripting/AudioDeviceScriptingInterface.h"

0
libraries/ui/src/HFWebEngineProfile.cpp → interface/src/networking/HFWebEngineProfile.cpp
View file

0
libraries/ui/src/HFWebEngineProfile.h → interface/src/networking/HFWebEngineProfile.h
View file

0
libraries/ui/src/HFWebEngineRequestInterceptor.cpp → interface/src/networking/HFWebEngineRequestInterceptor.cpp
View file

0
libraries/ui/src/HFWebEngineRequestInterceptor.h → interface/src/networking/HFWebEngineRequestInterceptor.h
View file

2
libraries/ui/CMakeLists.txt
View file

@ -1,3 +1,3 @@
set(TARGET_NAME ui)
setup_hifi_library(OpenGL Network Qml Quick Script WebChannel WebEngine WebSockets XmlPatterns)
setup_hifi_library(OpenGL Network Qml Quick Script WebChannel WebSockets XmlPatterns)
link_hifi_libraries(shared networking gl)