diff options
| author | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-06-09 13:59:07 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-06-09 13:59:07 +0200 |
| commit | 0963be63ce741ef6c7585358c3f3b1cb806b66e8 (patch) | |
| tree | 6f4964c196b8a52cb15e9efc0388b6a549574460 /examples/webkit/webkit-guide/js | |
| parent | 9e6a1351823b3ee3d7e380248f6ef42ff383b014 (diff) | |
| parent | eacfbbf64ef90dad8c5cb6b2c812ad64c1100779 (diff) | |
Merge remote-tracking branch 'qt/dev' into dev-highdpi
Conflicts:
src/gui/kernel/qsimpledrag.cpp
src/gui/kernel/qwindowsysteminterface.cpp
src/gui/kernel/qwindowsysteminterface_p.h
src/plugins/platforms/xcb/qxcbwindow.cpp
Change-Id: Icd887552ade61d6a2b2527383970f7145aa00faf
Diffstat (limited to 'examples/webkit/webkit-guide/js')
| -rw-r--r--[-rwxr-xr-x] | examples/webkit/webkit-guide/js/anim_accord.js | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | examples/webkit/webkit-guide/js/anim_gallery.js | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | examples/webkit/webkit-guide/js/anim_panel.js | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | examples/webkit/webkit-guide/js/anim_skew.js | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | examples/webkit/webkit-guide/js/css3_backgrounds.js | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | examples/webkit/webkit-guide/js/css3_border-img.js | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | examples/webkit/webkit-guide/js/css3_grad-radial.js | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | examples/webkit/webkit-guide/js/css3_mask-grad.js | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | examples/webkit/webkit-guide/js/css3_mask-img.js | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | examples/webkit/webkit-guide/js/css3_text-overflow.js | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | examples/webkit/webkit-guide/js/form_tapper.js | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | examples/webkit/webkit-guide/js/mob_condjs.js | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | examples/webkit/webkit-guide/js/mobile.js | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | examples/webkit/webkit-guide/js/storage.js | 0 |
14 files changed, 0 insertions, 0 deletions
diff --git a/examples/webkit/webkit-guide/js/anim_accord.js b/examples/webkit/webkit-guide/js/anim_accord.js index cc95b7f7c9..cc95b7f7c9 100755..100644 --- a/examples/webkit/webkit-guide/js/anim_accord.js +++ b/examples/webkit/webkit-guide/js/anim_accord.js diff --git a/examples/webkit/webkit-guide/js/anim_gallery.js b/examples/webkit/webkit-guide/js/anim_gallery.js index 050f113bb4..050f113bb4 100755..100644 --- a/examples/webkit/webkit-guide/js/anim_gallery.js +++ b/examples/webkit/webkit-guide/js/anim_gallery.js diff --git a/examples/webkit/webkit-guide/js/anim_panel.js b/examples/webkit/webkit-guide/js/anim_panel.js index e6cc5e6d8f..e6cc5e6d8f 100755..100644 --- a/examples/webkit/webkit-guide/js/anim_panel.js +++ b/examples/webkit/webkit-guide/js/anim_panel.js diff --git a/examples/webkit/webkit-guide/js/anim_skew.js b/examples/webkit/webkit-guide/js/anim_skew.js index 8b1300fd1f..8b1300fd1f 100755..100644 --- a/examples/webkit/webkit-guide/js/anim_skew.js +++ b/examples/webkit/webkit-guide/js/anim_skew.js diff --git a/examples/webkit/webkit-guide/js/css3_backgrounds.js b/examples/webkit/webkit-guide/js/css3_backgrounds.js index 29004c7b53..29004c7b53 100755..100644 --- a/examples/webkit/webkit-guide/js/css3_backgrounds.js +++ b/examples/webkit/webkit-guide/js/css3_backgrounds.js diff --git a/examples/webkit/webkit-guide/js/css3_border-img.js b/examples/webkit/webkit-guide/js/css3_border-img.js index a8bfd9132d..a8bfd9132d 100755..100644 --- a/examples/webkit/webkit-guide/js/css3_border-img.js +++ b/examples/webkit/webkit-guide/js/css3_border-img.js diff --git a/examples/webkit/webkit-guide/js/css3_grad-radial.js b/examples/webkit/webkit-guide/js/css3_grad-radial.js index f194ddaa6c..f194ddaa6c 100755..100644 --- a/examples/webkit/webkit-guide/js/css3_grad-radial.js +++ b/examples/webkit/webkit-guide/js/css3_grad-radial.js diff --git a/examples/webkit/webkit-guide/js/css3_mask-grad.js b/examples/webkit/webkit-guide/js/css3_mask-grad.js index 911212dcf4..911212dcf4 100755..100644 --- a/examples/webkit/webkit-guide/js/css3_mask-grad.js +++ b/examples/webkit/webkit-guide/js/css3_mask-grad.js diff --git a/examples/webkit/webkit-guide/js/css3_mask-img.js b/examples/webkit/webkit-guide/js/css3_mask-img.js index a8bfd9132d..a8bfd9132d 100755..100644 --- a/examples/webkit/webkit-guide/js/css3_mask-img.js +++ b/examples/webkit/webkit-guide/js/css3_mask-img.js diff --git a/examples/webkit/webkit-guide/js/css3_text-overflow.js b/examples/webkit/webkit-guide/js/css3_text-overflow.js index 58af80d6d1..58af80d6d1 100755..100644 --- a/examples/webkit/webkit-guide/js/css3_text-overflow.js +++ b/examples/webkit/webkit-guide/js/css3_text-overflow.js diff --git a/examples/webkit/webkit-guide/js/form_tapper.js b/examples/webkit/webkit-guide/js/form_tapper.js index d4d87a2c1a..d4d87a2c1a 100755..100644 --- a/examples/webkit/webkit-guide/js/form_tapper.js +++ b/examples/webkit/webkit-guide/js/form_tapper.js diff --git a/examples/webkit/webkit-guide/js/mob_condjs.js b/examples/webkit/webkit-guide/js/mob_condjs.js index 32bf550d20..32bf550d20 100755..100644 --- a/examples/webkit/webkit-guide/js/mob_condjs.js +++ b/examples/webkit/webkit-guide/js/mob_condjs.js diff --git a/examples/webkit/webkit-guide/js/mobile.js b/examples/webkit/webkit-guide/js/mobile.js index 51c94d4080..51c94d4080 100755..100644 --- a/examples/webkit/webkit-guide/js/mobile.js +++ b/examples/webkit/webkit-guide/js/mobile.js diff --git a/examples/webkit/webkit-guide/js/storage.js b/examples/webkit/webkit-guide/js/storage.js index b5a374f39d..b5a374f39d 100755..100644 --- a/examples/webkit/webkit-guide/js/storage.js +++ b/examples/webkit/webkit-guide/js/storage.js |