diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
| commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
| tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Tools/QtTestBrowser/main.cpp | |
| parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
| download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 | |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Tools/QtTestBrowser/main.cpp')
| -rw-r--r-- | Tools/QtTestBrowser/main.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Tools/QtTestBrowser/main.cpp b/Tools/QtTestBrowser/main.cpp index ec5f1d9..eecd9c3 100644 --- a/Tools/QtTestBrowser/main.cpp +++ b/Tools/QtTestBrowser/main.cpp @@ -164,18 +164,18 @@ void LauncherApplication::handleUserOptions() } if (args.contains("-local-storage-enabled")) - QWebSettings::globalSettings()->setAttribute(QWebSettings::LocalStorageEnabled, true); + windowOptions.useLocalStorage = true; if (args.contains("-offline-storage-database-enabled")) - QWebSettings::globalSettings()->setAttribute(QWebSettings::OfflineStorageDatabaseEnabled, true); + windowOptions.useOfflineStorageDatabase = true; if (args.contains("-offline-web-application-cache-enabled")) - QWebSettings::globalSettings()->setAttribute(QWebSettings::OfflineWebApplicationCacheEnabled, true); + windowOptions.useOfflineWebApplicationCache = true; int setOfflineStorageDefaultQuotaIndex = args.indexOf("-set-offline-storage-default-quota"); if (setOfflineStorageDefaultQuotaIndex != -1) { - int maxSize = takeOptionValue(&args, setOfflineStorageDefaultQuotaIndex).toInt(); - QWebSettings::globalSettings()->setOfflineStorageDefaultQuota(maxSize); + unsigned int maxSize = takeOptionValue(&args, setOfflineStorageDefaultQuotaIndex).toUInt(); + windowOptions.offlineStorageDefaultQuotaSize = maxSize; } if (defaultForAnimations) |