summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2016-04-08 10:23:45 +0200
committerLiang Qi <liang.qi@theqtcompany.com>2016-04-08 10:23:45 +0200
commitb49bfdaad11be1de632f907d43485a7ac701ddc5 (patch)
tree3e1553d28dada6cbce524d2ad4e2a97ff9fd8a9e
parent55f2fe374f0314e87e1ca5618bab6fac94430c78 (diff)
parentb16873afea798d08799d7a0b255b8d200337f35b (diff)
downloadqtscript-b49bfdaad11be1de632f907d43485a7ac701ddc5.tar.gz
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1
Change-Id: I51a29b9b4b1307dd380126407fa4f5e4c80e127f
-rw-r--r--src/script/doc/images/qtscript-debugger.pngbin127509 -> 96223 bytes
-rw-r--r--src/scripttools/debugging/images/breakpoint.pngbin1046 -> 975 bytes
-rw-r--r--src/scripttools/debugging/images/d_breakpoint.pngbin1056 -> 956 bytes
-rw-r--r--src/scripttools/debugging/images/location.pngbin748 -> 600 bytes
-rw-r--r--src/scripttools/debugging/images/return.pngbin694 -> 536 bytes
-rw-r--r--src/scripttools/debugging/images/runtonewscript.pngbin534 -> 361 bytes
6 files changed, 0 insertions, 0 deletions
diff --git a/src/script/doc/images/qtscript-debugger.png b/src/script/doc/images/qtscript-debugger.png
index c417d0b..f0720c8 100644
--- a/src/script/doc/images/qtscript-debugger.png
+++ b/src/script/doc/images/qtscript-debugger.png
Binary files differ
diff --git a/src/scripttools/debugging/images/breakpoint.png b/src/scripttools/debugging/images/breakpoint.png
index 21c4376..faee3f0 100644
--- a/src/scripttools/debugging/images/breakpoint.png
+++ b/src/scripttools/debugging/images/breakpoint.png
Binary files differ
diff --git a/src/scripttools/debugging/images/d_breakpoint.png b/src/scripttools/debugging/images/d_breakpoint.png
index 867b30d..aa6bf55 100644
--- a/src/scripttools/debugging/images/d_breakpoint.png
+++ b/src/scripttools/debugging/images/d_breakpoint.png
Binary files differ
diff --git a/src/scripttools/debugging/images/location.png b/src/scripttools/debugging/images/location.png
index 6c4a4bf..d911c31 100644
--- a/src/scripttools/debugging/images/location.png
+++ b/src/scripttools/debugging/images/location.png
Binary files differ
diff --git a/src/scripttools/debugging/images/return.png b/src/scripttools/debugging/images/return.png
index 9db255a..5f192b8 100644
--- a/src/scripttools/debugging/images/return.png
+++ b/src/scripttools/debugging/images/return.png
Binary files differ
diff --git a/src/scripttools/debugging/images/runtonewscript.png b/src/scripttools/debugging/images/runtonewscript.png
index fb5fe5a..182c233 100644
--- a/src/scripttools/debugging/images/runtonewscript.png
+++ b/src/scripttools/debugging/images/runtonewscript.png
Binary files differ