diff --git a/.git-fixfiles b/.git-fixfiles
index 8d2d98a7..394f8593 100644
--- a/.git-fixfiles
+++ b/.git-fixfiles
@@ -1,4 +1,4 @@
#!/bin/sh
git update-index --assume-unchanged cpp/prebuilt/**/*.so
-git update-index --assume-unchanged cpp/iedriver/Generated/atoms.h
+#git update-index --assume-unchanged cpp/iedriver/Generated/atoms.h
exit 0
diff --git a/.gitignore b/.gitignore
index addf95d3..8b55eabb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,9 @@ javascript/node/selenium-webdriver/node_modules/
.idea/vcs.xml
.idea/misc.xml
.idea/workspace.xml
+.idea/projectCodeStyle.xml
+*.idea*
+*.iml
.idea/dictionaries/
.idea/scopes/
.idea/qaplug_profiles.xml
@@ -66,4 +69,4 @@ GSYMS
GTAGS
.project
Gemfile.lock
-/rb/.bundle
\ No newline at end of file
+/rb/.bundle
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
index 15ed1f4f..1e106b98 100644
--- a/.idea/codeStyleSettings.xml
+++ b/.idea/codeStyleSettings.xml
@@ -409,10 +409,6 @@
-
-
-
-
diff --git a/.idea/libraries/commons_collections.xml b/.idea/libraries/commons_collections.xml
index f5558727..0514df76 100644
--- a/.idea/libraries/commons_collections.xml
+++ b/.idea/libraries/commons_collections.xml
@@ -1,11 +1,10 @@
+
-
-
-
+
\ No newline at end of file
diff --git a/.idea/libraries/little_proxy.xml b/.idea/libraries/little_proxy.xml
index fb2af12b..ed627887 100644
--- a/.idea/libraries/little_proxy.xml
+++ b/.idea/libraries/little_proxy.xml
@@ -1,11 +1,11 @@
-
+
-
+
\ No newline at end of file
diff --git a/README.md b/README.md
index f8529a2a..7e6e59b7 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Selenium
+# Selenium (branch with QtWebDriver)
Selenium is an umbrella project for various tools and libraries that
enable automation of web browsers. Amongst other things it provides
@@ -6,6 +6,14 @@ the support infrastructure for the [W3C WebDriver
specification](https://dvcs.w3.org/hg/webdriver/raw-file/tip/webdriver-spec.html),
that lets you write interchangable code for all major web browsers.
+This fork of Selenium includes Java language bindings for [QtWebDriver]
+(https://github.com/cisco-open-source/qtwebdriver), see [QtWebDriverService]
+(https://github.com/cisco-open-source/selenium/blob/master/java/client/src/org/openqa/selenium/qtwebkit/QtWebDriverService.java) class.
+It is possible to test QWidget, QWebView, QQuick1 (Qt4),
+QQuick2 (Qt5) or hybrid applications using this driver. QtWebDriver features
+are covered by series tests included in this repository. Information
+how to run them is available below.
+
The project is made possible by volunteer contributors who have put in
thousands of hours of their own time, and made the source code freely
available under the [Apache 2.0
@@ -180,6 +188,23 @@ Note that the `test_chrome` target requires that you have the separate
[Chrome Driver](http://code.google.com/p/selenium/wiki/ChromeDriver)
binary available on your `PATH`.
+To run QtWebDriver tests try:
+
+```sh
+./go test_qtwebkit
+./go test_wd_native_qt4
+./go test_wd_native_qt5
+./go test_wd_hybrid_qt4
+./go test_wd_hybrid_qt5
+./go test_wd_quick1
+./go test_wd_quick2
+```
+
+These targets require environment variable `qtwebdriver` to contain path
+to the separate [QtWebDriver](https://github.com/cisco-open-source/qtwebdriver)
+binary. Additional command line arguments to run this binary can be
+provided with `qtwebdriverargs` environment variable.
+
If you are interested in a single language binding, try one of:
```sh
diff --git a/Rakefile b/Rakefile
index 9670cd5f..ab21878d 100644
--- a/Rakefile
+++ b/Rakefile
@@ -165,6 +165,16 @@ task :test_remote => [
'//java/client/test/org/openqa/selenium/remote:client-tests:run',
:test_remote_server
]
+task :test_qtwebkit => [
+ '//java/client/test/org/openqa/selenium/qtwebkit:test_qtwebkit:run'
+]
+task :test_wd_native_qt4 => [ '//java/client/test/org/openqa/selenium/qtwebkit/nativetests:nativetests_qt4:run' ]
+task :test_wd_native_qt5 => [ '//java/client/test/org/openqa/selenium/qtwebkit/nativetests:nativetests_qt5:run' ]
+task :test_wd_hybrid_qt4 => [ '//java/client/test/org/openqa/selenium/qtwebkit/hybridtests:hybrid_tests_qt4:run' ]
+task :test_wd_hybrid_qt5 => [ '//java/client/test/org/openqa/selenium/qtwebkit/hybridtests:hybrid_tests_qt5:run' ]
+task :test_wd_quick1 => [ '//java/client/test/org/openqa/selenium/qtwebkit/quick_tests:quick1_tests:run' ]
+task :test_wd_quick2 => [ '//java/client/test/org/openqa/selenium/qtwebkit/quick_tests:quick2_tests:run' ]
+task :test_wd_visualizer => [ '//java/client/test/org/openqa/selenium/qtwebkit/visualizer_tests:test_wd_visualizer:run' ]
task :test_safari => [ "//java/client/test/org/openqa/selenium/safari:test:run" ]
task :test_phantomjs => [ "//java/client/test/org/openqa/selenium/phantomjs:test:run" ]
task :test_support => [
diff --git a/android/Android.iml b/android/Android.iml
new file mode 100644
index 00000000..378c8d2c
--- /dev/null
+++ b/android/Android.iml
@@ -0,0 +1,82 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ /res-overlay
+
+ true
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/android/android.iml b/android/android.iml
new file mode 100644
index 00000000..b24688e0
--- /dev/null
+++ b/android/android.iml
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/android/gen/org/openqa/selenium/android/app/BuildConfig.java b/android/gen/org/openqa/selenium/android/app/BuildConfig.java
new file mode 100644
index 00000000..cd4e4aab
--- /dev/null
+++ b/android/gen/org/openqa/selenium/android/app/BuildConfig.java
@@ -0,0 +1,6 @@
+/** Automatically generated file. DO NOT MODIFY */
+package org.openqa.selenium.android.app;
+
+public final class BuildConfig {
+ public final static boolean DEBUG = true;
+}
\ No newline at end of file
diff --git a/build.xml b/build.xml
new file mode 100644
index 00000000..50d39ce8
--- /dev/null
+++ b/build.xml
@@ -0,0 +1,16 @@
+
+
+ simple example build file
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/common/src/web/HTML5_Audio/mp3.mp3 b/common/src/web/HTML5_Audio/mp3.mp3
new file mode 100644
index 00000000..9d9233c0
Binary files /dev/null and b/common/src/web/HTML5_Audio/mp3.mp3 differ
diff --git a/common/src/web/HTML5_Audio/ogg.ogg b/common/src/web/HTML5_Audio/ogg.ogg
new file mode 100644
index 00000000..cbc0c84d
Binary files /dev/null and b/common/src/web/HTML5_Audio/ogg.ogg differ
diff --git a/common/src/web/HTML5_Audio/wav.wav b/common/src/web/HTML5_Audio/wav.wav
new file mode 100644
index 00000000..ac44342c
Binary files /dev/null and b/common/src/web/HTML5_Audio/wav.wav differ
diff --git a/common/src/web/HTML5_Audio/weba.weba b/common/src/web/HTML5_Audio/weba.weba
new file mode 100644
index 00000000..a397eb60
Binary files /dev/null and b/common/src/web/HTML5_Audio/weba.weba differ
diff --git a/common/src/web/HTML5_Audio_Test.html b/common/src/web/HTML5_Audio_Test.html
new file mode 100644
index 00000000..f02f8ef5
--- /dev/null
+++ b/common/src/web/HTML5_Audio_Test.html
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
diff --git a/common/src/web/HTML5_Video/big_buck_bunny.mp4 b/common/src/web/HTML5_Video/big_buck_bunny.mp4
new file mode 100644
index 00000000..81d11df5
Binary files /dev/null and b/common/src/web/HTML5_Video/big_buck_bunny.mp4 differ
diff --git a/common/src/web/HTML5_Video/big_buck_bunny.ogv b/common/src/web/HTML5_Video/big_buck_bunny.ogv
new file mode 100644
index 00000000..e128d82b
Binary files /dev/null and b/common/src/web/HTML5_Video/big_buck_bunny.ogv differ
diff --git a/common/src/web/HTML5_Video/big_buck_bunny.webm b/common/src/web/HTML5_Video/big_buck_bunny.webm
new file mode 100644
index 00000000..42e2130c
Binary files /dev/null and b/common/src/web/HTML5_Video/big_buck_bunny.webm differ
diff --git a/common/src/web/HTML5_Video_Test.html b/common/src/web/HTML5_Video_Test.html
new file mode 100644
index 00000000..676de034
--- /dev/null
+++ b/common/src/web/HTML5_Video_Test.html
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/common/src/web/pageWithOnBeforeUnloadMessage.html b/common/src/web/pageWithOnBeforeUnloadMessage.html
index cb59707e..6e0a0ddc 100644
--- a/common/src/web/pageWithOnBeforeUnloadMessage.html
+++ b/common/src/web/pageWithOnBeforeUnloadMessage.html
@@ -1,7 +1,7 @@
-