Commit 08636d12 authored by hausmann@webkit.org's avatar hausmann@webkit.org

Build fix for Qt and gcc 4.3.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@32199 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 5bf503e1
2008-04-18 Simon Hausmann <hausmann@webkit.org>
Build fix for Qt and gcc 4.3.
* WebCore.pro: Added missing files and include paths, re-ordered
the storage/ include path to avoid conflict of storage/LocalStorage.h
with kjs/LocalStorage.h
* page/PageGroup.h: Include LocalStorage.h instead of forward
declaration to fix compilation with gcc 4.3.
2008-04-18 Simon Hausmann <hausmann@webkit.org>
Build fix for Gtk and gcc 4.3.
......@@ -186,6 +186,11 @@ gtk-port {
../WebKit/gtk/webkit
}
# Make sure storage/ appears before JavaScriptCore/kjs. Both provide LocalStorage.h
# but the header from the former include path is included across directories while
# kjs/LocalStorage.h is included only from files within the same directory
INCLUDEPATH = $$PWD/storage $$INCLUDEPATH
INCLUDEPATH += $$PWD \
$$PWD/ForwardingHeaders \
$$PWD/.. \
......@@ -200,8 +205,8 @@ INCLUDEPATH += $$PWD \
$$PWD/svg/graphics/filters \
$$PWD/platform/sql \
$$PWD/platform/text \
$$PWD/storage \
$$PWD/loader \
$$PWD/loader/appcache \
$$PWD/loader/archive \
$$PWD/loader/icon \
$$PWD/css \
......@@ -1192,8 +1197,12 @@ contains(DEFINES, ENABLE_DATABASE=1) {
storage/DatabaseTask.cpp \
storage/DatabaseThread.cpp \
storage/DatabaseTracker.cpp \
storage/LocalStorage.cpp \
storage/LocalStorageArea.cpp \
storage/OriginQuotaManager.cpp \
storage/OriginUsageRecord.cpp \
storage/StorageArea.cpp \
storage/StorageMap.cpp \
storage/SQLResultSet.cpp \
storage/SQLResultSetRowList.cpp \
storage/SQLStatement.cpp \
......
......@@ -28,12 +28,12 @@
#include <wtf/HashSet.h>
#include <wtf/Noncopyable.h>
#include "LocalStorage.h"
#include "StringHash.h"
namespace WebCore {
class KURL;
class LocalStorage;
class Page;
class PageGroup : Noncopyable {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment