diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2017-06-15 12:13:20 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-06-17 10:46:54 +0000 |
| commit | aab669a05f943c587f6acccd94d53a8544170c1c (patch) | |
| tree | 2c22545100b500eb80d23f75b8e3180ed9b5f3b7 /Tools/QtTestBrowser | |
| parent | c119ecc79e19c630a8b1ef10fe01cc567901033f (diff) | |
| download | qtwebkit-aab669a05f943c587f6acccd94d53a8544170c1c.tar.gz | |
Import WebKit commit 6d0ad27b6bc4209fb8d8cee2692dc0c6a5462051v5.212.0-alpha2
Change-Id: Ifdedb7bc3162434686201813dc1d994cf5ae7e70
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Tools/QtTestBrowser')
| -rw-r--r-- | Tools/QtTestBrowser/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tools/QtTestBrowser/launcherwindow.cpp | 9 | ||||
| -rw-r--r-- | Tools/QtTestBrowser/launcherwindow.h | 1 |
3 files changed, 11 insertions, 1 deletions
diff --git a/Tools/QtTestBrowser/CMakeLists.txt b/Tools/QtTestBrowser/CMakeLists.txt index f43bb7852..a091c9541 100644 --- a/Tools/QtTestBrowser/CMakeLists.txt +++ b/Tools/QtTestBrowser/CMakeLists.txt @@ -66,7 +66,7 @@ include_directories(${QtTestBrowser_INCLUDE_DIRECTORIES}) include_directories(SYSTEM ${QtTestBrowser_SYSTEM_INCLUDE_DIRECTORIES}) add_executable(QtTestBrowser ${QtTestBrowser_SOURCES}) target_link_libraries(QtTestBrowser ${QtTestBrowser_LIBRARIES}) -set_target_properties(QtTestBrowser PROPERTIES FOLDER "Tools") +set_target_properties(QtTestBrowser PROPERTIES FOLDER "Tools" AUTOMOC ON) if (${CMAKE_BUILD_TYPE} MATCHES "Release") set_target_properties(QtTestBrowser PROPERTIES WIN32_EXECUTABLE ON) diff --git a/Tools/QtTestBrowser/launcherwindow.cpp b/Tools/QtTestBrowser/launcherwindow.cpp index 26b6dce79..0fd64654e 100644 --- a/Tools/QtTestBrowser/launcherwindow.cpp +++ b/Tools/QtTestBrowser/launcherwindow.cpp @@ -353,6 +353,10 @@ void LauncherWindow::createChrome() touchMockAction->setCheckable(true); touchMockAction->setShortcut(QKeySequence(Qt::CTRL | Qt::ALT | Qt::Key_T)); + QAction* toggleWebSecurity = toolsMenu->addAction("Disable Web Security", this, SLOT(toggleWebSecurity(bool))); + toggleWebSecurity->setCheckable(true); + toggleWebSecurity->setChecked(false); + toolsMenu->addSeparator(); QAction* toggleLocalStorage = toolsMenu->addAction("Enable Local Storage", this, SLOT(toggleLocalStorage(bool))); @@ -1001,6 +1005,11 @@ void LauncherWindow::togglePrivateBrowsing(bool enable) page()->settings()->setAttribute(QWebSettings::PrivateBrowsingEnabled, enable); } +void LauncherWindow::toggleWebSecurity(bool enable) +{ + page()->settings()->setAttribute(QWebSettings::WebSecurityEnabled, !enable); +} + void LauncherWindow::setUseDiskCookies(bool enable) { testBrowserCookieJarInstance()->setDiskStorageEnabled(enable); diff --git a/Tools/QtTestBrowser/launcherwindow.h b/Tools/QtTestBrowser/launcherwindow.h index 0b5ea32db..a05a6cd56 100644 --- a/Tools/QtTestBrowser/launcherwindow.h +++ b/Tools/QtTestBrowser/launcherwindow.h @@ -144,6 +144,7 @@ protected Q_SLOTS: void toggleJavascriptCanOpenWindows(bool enable); void toggleAutoLoadImages(bool enable); void togglePrivateBrowsing(bool enable); + void toggleWebSecurity(bool enable); void setUseDiskCookies(bool enable); void clearCookies(); void togglePlugins(bool enable); |