diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-20 16:48:45 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-23 18:54:18 +0100 |
| commit | 53733164eb6cabab5a1eddcabb42e4ce27eb0e44 (patch) | |
| tree | 1ba5405cbf0bf31341e2e260a7ed05c9dcce8e4b /Source/WebCore/bridge/qt | |
| parent | 9bbecbe38e6249c7b1c0874e80503f6162f13613 (diff) | |
| download | external_webkit-53733164eb6cabab5a1eddcabb42e4ce27eb0e44.zip external_webkit-53733164eb6cabab5a1eddcabb42e4ce27eb0e44.tar.gz external_webkit-53733164eb6cabab5a1eddcabb42e4ce27eb0e44.tar.bz2 | |
Merge WebKit at r76408: Fix Bridge.h
Cherry pick of upstream http://trac.webkit.org/changeset/79988
Needed now due to FastAllocBase and Noncopyable changes in this
merge.
Change-Id: I26c91f7940b106db21e26c37507490acd1546cff
Diffstat (limited to 'Source/WebCore/bridge/qt')
| -rw-r--r-- | Source/WebCore/bridge/qt/qt_class.h | 2 | ||||
| -rw-r--r-- | Source/WebCore/bridge/qt/qt_instance.h | 2 | ||||
| -rw-r--r-- | Source/WebCore/bridge/qt/qt_pixmapruntime.h | 2 | ||||
| -rw-r--r-- | Source/WebCore/bridge/qt/qt_runtime.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/Source/WebCore/bridge/qt/qt_class.h b/Source/WebCore/bridge/qt/qt_class.h index 9d55cc5..4c1a753 100644 --- a/Source/WebCore/bridge/qt/qt_class.h +++ b/Source/WebCore/bridge/qt/qt_class.h @@ -20,7 +20,7 @@ #ifndef qt_class_h #define qt_class_h -#include "Bridge.h" +#include "BridgeJSC.h" #include "qglobal.h" QT_BEGIN_NAMESPACE diff --git a/Source/WebCore/bridge/qt/qt_instance.h b/Source/WebCore/bridge/qt/qt_instance.h index dd24a92..25aea53 100644 --- a/Source/WebCore/bridge/qt/qt_instance.h +++ b/Source/WebCore/bridge/qt/qt_instance.h @@ -20,7 +20,7 @@ #ifndef qt_instance_h #define qt_instance_h -#include "Bridge.h" +#include "BridgeJSC.h" #include "runtime_root.h" #include <QtScript/qscriptengine.h> #include <qhash.h> diff --git a/Source/WebCore/bridge/qt/qt_pixmapruntime.h b/Source/WebCore/bridge/qt/qt_pixmapruntime.h index e2ae5e9..b474efd 100644 --- a/Source/WebCore/bridge/qt/qt_pixmapruntime.h +++ b/Source/WebCore/bridge/qt/qt_pixmapruntime.h @@ -20,7 +20,7 @@ #ifndef qt_pixmapruntime_h #define qt_pixmapruntime_h -#include "Bridge.h" +#include "BridgeJSC.h" #include <QVariant> namespace JSC { diff --git a/Source/WebCore/bridge/qt/qt_runtime.h b/Source/WebCore/bridge/qt/qt_runtime.h index 68bf865..8dab08c 100644 --- a/Source/WebCore/bridge/qt/qt_runtime.h +++ b/Source/WebCore/bridge/qt/qt_runtime.h @@ -20,7 +20,7 @@ #ifndef BINDINGS_QT_RUNTIME_H_ #define BINDINGS_QT_RUNTIME_H_ -#include "Bridge.h" +#include "BridgeJSC.h" #include "Completion.h" #include "Protect.h" #include "runtime_method.h" |