diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-23 15:08:59 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-23 15:09:20 +0100 |
| commit | 061d58bc0fa016cfeed744fd3e4663460635d69b (patch) | |
| tree | ad9b8b032c803e1c9054c23fa1b7a0f1976bf98f /Source/WebKit/qt/Api/qwebsettings.cpp | |
| parent | 470286ecfe79d59df14944e5b5d34630fc739391 (diff) | |
| download | qtwebkit-061d58bc0fa016cfeed744fd3e4663460635d69b.tar.gz | |
Imported WebKit commit 8eb048315f36fa33731f28694630fe4a3c2cbc99 (http://svn.webkit.org/repository/webkit/trunk@135602)
New snapshot that fixes various bugs
Change-Id: Icb6ce541a26a9f500d087821ce4b83a8d8a5474a
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'Source/WebKit/qt/Api/qwebsettings.cpp')
| -rw-r--r-- | Source/WebKit/qt/Api/qwebsettings.cpp | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/Source/WebKit/qt/Api/qwebsettings.cpp b/Source/WebKit/qt/Api/qwebsettings.cpp index 768c80256..74d8524d8 100644 --- a/Source/WebKit/qt/Api/qwebsettings.cpp +++ b/Source/WebKit/qt/Api/qwebsettings.cpp @@ -20,41 +20,39 @@ #include "config.h" #include "qwebsettings.h" -#include "qwebpage.h" -#include "qwebpage_p.h" #include "qwebplugindatabase_p.h" #include "AbstractDatabase.h" -#include "MemoryCache.h" +#include "ApplicationCacheStorage.h" #include "CrossOriginPreflightResultCache.h" +#include "DatabaseTracker.h" +#include "FileSystem.h" #include "FontCache.h" +#include "IconDatabase.h" +#include "Image.h" #if ENABLE(ICONDATABASE) #include "IconDatabaseClientQt.h" #endif #include "InitWebCoreQt.h" +#include "IntSize.h" +#include "KURL.h" +#include "MemoryCache.h" +#include "NetworkStateNotifier.h" #include "Page.h" #include "PageCache.h" -#include "Settings.h" -#include "KURL.h" -#include "IconDatabase.h" #include "PluginDatabase.h" -#include "Image.h" -#include "IntSize.h" -#include "ApplicationCacheStorage.h" -#include "DatabaseTracker.h" -#include "FileSystem.h" -#include <wtf/text/WTFString.h> - -#include <QApplication> -#include <QStandardPaths> +#include "Settings.h" #include <QDir> +#include <QFileInfo> +#include <QFont> +#include <QGuiApplication> #include <QHash> #include <QSharedData> +#include <QStandardPaths> #include <QUrl> -#include <QFileInfo> -#include <QStyle> +#include <wtf/text/WTFString.h> + -#include "NetworkStateNotifier.h" void QWEBKIT_EXPORT qt_networkAccessAllowed(bool isAllowed) { |