diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-11-24 13:37:06 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-11-24 13:39:13 +0100 |
| commit | 34aba4724f196e34ed02cf50073f41968f119bb6 (patch) | |
| tree | 0ebdfcabda989ab76ee6de53c6461553c7a767a5 /doc/src | |
| parent | b86b2a742afae118bf974c82ba966ddb0cae4afb (diff) | |
| parent | b1cf07f495e10c93e53651ac03e46ebdaea0a97e (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/corelib/io/qiodevice.cpp
src/plugins/bearer/linux_common/qofonoservice_linux.cpp
src/plugins/bearer/linux_common/qofonoservice_linux_p.h
src/plugins/platforms/android/qandroidplatformtheme.cpp
src/tools/bootstrap/bootstrap.pro
src/widgets/styles/qmacstyle_mac.mm
Change-Id: Ia02aab6c4598ce74e9c30bb4666d5e2ef000f99b
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/images/analogclock-example.png | bin | 2383 -> 14556 bytes |
| -rw-r--r-- | doc/src/images/application.png | bin | 26272 -> 19503 bytes |
| -rw-r--r-- | doc/src/images/digitalclock-example.png | bin | 6142 -> 6603 bytes |
| -rw-r--r-- | doc/src/images/scribble-example.png | bin | 9053 -> 19910 bytes |
4 files changed, 0 insertions, 0 deletions
diff --git a/doc/src/images/analogclock-example.png b/doc/src/images/analogclock-example.png Binary files differindex ffd7baa716..b195f8bf24 100644 --- a/doc/src/images/analogclock-example.png +++ b/doc/src/images/analogclock-example.png diff --git a/doc/src/images/application.png b/doc/src/images/application.png Binary files differindex 2fb7f2f18e..bff37369a4 100644 --- a/doc/src/images/application.png +++ b/doc/src/images/application.png diff --git a/doc/src/images/digitalclock-example.png b/doc/src/images/digitalclock-example.png Binary files differindex 473986608c..917035a0f0 100644 --- a/doc/src/images/digitalclock-example.png +++ b/doc/src/images/digitalclock-example.png diff --git a/doc/src/images/scribble-example.png b/doc/src/images/scribble-example.png Binary files differindex a2cb1de3e8..54091baa6b 100644 --- a/doc/src/images/scribble-example.png +++ b/doc/src/images/scribble-example.png |
