[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
commit-queue at webkit.org
commit-queue at webkit.org
Fri Jan 21 14:57:54 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit 70dd573fc68ca41d2a4b2a3c44d8b9d32361d55e
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Jan 5 17:37:33 2011 +0000
2011-01-05 Kundu Suchismita <suchi.kundu at nokia.com>
Reviewed by Andreas Kling.
[Qt]Add local storage settings to QtTestBrowser command line arguments
https://bugs.webkit.org/show_bug.cgi?id=51750
* QtTestBrowser/main.cpp:
(LauncherApplication::handleUserOptions):
Local storage settings can be enable form command line arguments for
QtTestBrowser.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75074 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 2c95f17..4391022 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-05 Kundu Suchismita <suchi.kundu at nokia.com>
+
+ Reviewed by Andreas Kling.
+
+ [Qt]Add local storage settings to QtTestBrowser command line arguments
+ https://bugs.webkit.org/show_bug.cgi?id=51750
+
+ * QtTestBrowser/main.cpp:
+ (LauncherApplication::handleUserOptions):
+ Local storage settings can be enable form command line arguments for
+ QtTestBrowser.
+
2011-01-05 Chris Fleizach <cfleizach at apple.com>
Reviewed by Martin Robinson.
diff --git a/Tools/QtTestBrowser/main.cpp b/Tools/QtTestBrowser/main.cpp
index 41471fa..ec5f1d9 100644
--- a/Tools/QtTestBrowser/main.cpp
+++ b/Tools/QtTestBrowser/main.cpp
@@ -126,6 +126,10 @@ void LauncherApplication::handleUserOptions()
<< "[-inspector-url location]"
<< "[-tiled-backing-store]"
<< "[-resizes-to-contents]"
+ << "[-local-storage-enabled]"
+ << "[-offline-storage-database-enabled]"
+ << "[-offline-web-application-cache-enabled]"
+ << "[-set-offline-storage-default-quota maxSize]"
<< "URLs";
appQuit(0);
}
@@ -158,7 +162,22 @@ void LauncherApplication::handleUserOptions()
requiresGraphicsView("-resizes-to-contents");
windowOptions.resizesToContents = true;
}
-
+
+ if (args.contains("-local-storage-enabled"))
+ QWebSettings::globalSettings()->setAttribute(QWebSettings::LocalStorageEnabled, true);
+
+ if (args.contains("-offline-storage-database-enabled"))
+ QWebSettings::globalSettings()->setAttribute(QWebSettings::OfflineStorageDatabaseEnabled, true);
+
+ if (args.contains("-offline-web-application-cache-enabled"))
+ QWebSettings::globalSettings()->setAttribute(QWebSettings::OfflineWebApplicationCacheEnabled, true);
+
+ int setOfflineStorageDefaultQuotaIndex = args.indexOf("-set-offline-storage-default-quota");
+ if (setOfflineStorageDefaultQuotaIndex != -1) {
+ int maxSize = takeOptionValue(&args, setOfflineStorageDefaultQuotaIndex).toInt();
+ QWebSettings::globalSettings()->setOfflineStorageDefaultQuota(maxSize);
+ }
+
if (defaultForAnimations)
windowOptions.viewportUpdateMode = QGraphicsView::BoundingRectViewportUpdate;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list