forked from enlightenment/efl
web: Move EWebKit headers out of Elementary.h again
Since rELM166ca9e86a72, I moved EWebKit header into Elementary.h like other libraries. But, it made possible build break while building test browser in webkit. It's because EWebKit.h and EWebKit2.h have same symbols and test browser should be compiled with EWebKit2.h although Elementary was built with ewebkit. This patch reverts a part of changes in rELM166ca9e86a72, which includes EWebkit.h in Elementary.h
This commit is contained in:
parent
3dfef42f5f
commit
a580c2ba5b
|
@ -93,14 +93,6 @@
|
|||
#include <EMap.h>
|
||||
#endif
|
||||
|
||||
#ifdef ELM_WEB
|
||||
#include <EWebKit.h>
|
||||
#endif
|
||||
|
||||
#ifdef ELM_WEB2
|
||||
#include <EWebKit2.h>
|
||||
#endif
|
||||
|
||||
#ifdef EAPI
|
||||
# undef EAPI
|
||||
#endif
|
||||
|
|
|
@ -22,6 +22,7 @@ EAPI Eo_Op ELM_OBJ_WEB_BASE_ID = EO_NOOP;
|
|||
#define MY_CLASS_NAME_LEGACY "elm_web"
|
||||
|
||||
#ifdef HAVE_ELEMENTARY_WEB
|
||||
#include <EWebKit.h>
|
||||
|
||||
/* Similar to iPhone */
|
||||
// TODO: switch between iPhone, iPad or Chrome/Safari based on some
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
#include "elm_widget_web.h"
|
||||
|
||||
#if defined(HAVE_ELEMENTARY_WEB) && defined(USE_WEBKIT2)
|
||||
#include <EWebKit2.h>
|
||||
|
||||
EAPI Eo_Op ELM_OBJ_WEB_BASE_ID = EO_NOOP;
|
||||
|
||||
|
|
Loading…
Reference in New Issue