diff options
author | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2014-11-11 12:51:23 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-11-11 12:51:23 +0100 |
commit | 9d38dbde7663a2de8186b32e222ce8fab9cf909d (patch) | |
tree | b859ad71c3750f4cd7c2d383cc9f15cb0e0c6d7f /doc/global | |
parent | 9b7bdd455fefc2df78eb540e9f570877aa8cd827 (diff) | |
parent | 0d02a06517f29c5b51fb2d3ac64a5e6d9daed5a9 (diff) |
Merge "Merge remote-tracking branch 'origin/5.4' into 5.4.0" into refs/staging/5.4.0
Diffstat (limited to 'doc/global')
-rw-r--r-- | doc/global/externalsites/qtcreator.qdoc | 12 | ||||
-rw-r--r-- | doc/global/template/images/Qt-logo.png | bin | 4344 -> 2425 bytes | |||
-rw-r--r-- | doc/global/template/images/logo.png | bin | 2205 -> 2370 bytes | |||
-rw-r--r-- | doc/global/template/images/sprites-combined.png | bin | 62534 -> 53964 bytes | |||
-rw-r--r-- | doc/global/template/style/offline.css | 1 |
5 files changed, 12 insertions, 1 deletions
diff --git a/doc/global/externalsites/qtcreator.qdoc b/doc/global/externalsites/qtcreator.qdoc index 46609de160..a98fbd0a56 100644 --- a/doc/global/externalsites/qtcreator.qdoc +++ b/doc/global/externalsites/qtcreator.qdoc @@ -483,3 +483,15 @@ \externalpage http://qt-project.org/doc/qtcreator/creator-developing-winrt.html \title Qt Creator: Connecting Windows Runtime Devices */ +/*! + \externalpage http://qt-project.org/doc/qtcreator/creator-clang-codemodel.html + \title Qt Creator: Parsing C++ Files +*/ +/*! + \externalpage http://qt-project.org/doc/qtcreator/creator-quick-ui-forms.html + \title Qt Creator: Qt Quick UI Forms +*/ +/*! + \externalpage http://qt-project.org/doc/qtcreator/creator-clang-static-analyzer.html + \title Qt Creator: Using Clang Static Analyzer +*/ diff --git a/doc/global/template/images/Qt-logo.png b/doc/global/template/images/Qt-logo.png Binary files differindex 64c1c4aaa3..01256ab08d 100644 --- a/doc/global/template/images/Qt-logo.png +++ b/doc/global/template/images/Qt-logo.png diff --git a/doc/global/template/images/logo.png b/doc/global/template/images/logo.png Binary files differindex 1e7ed4cf21..698dde9215 100644 --- a/doc/global/template/images/logo.png +++ b/doc/global/template/images/logo.png diff --git a/doc/global/template/images/sprites-combined.png b/doc/global/template/images/sprites-combined.png Binary files differindex 3a48b21f6b..c4f01c4bb9 100644 --- a/doc/global/template/images/sprites-combined.png +++ b/doc/global/template/images/sprites-combined.png diff --git a/doc/global/template/style/offline.css b/doc/global/template/style/offline.css index 5957e3840d..126df9d806 100644 --- a/doc/global/template/style/offline.css +++ b/doc/global/template/style/offline.css @@ -2,7 +2,6 @@ body { font: normal 400 14px/1.2 Arial; margin-top: 85px; font-family: Arial, Helvetica; - color: #313131; text-align: left; margin-left: 5px; margin-right: 5px; |