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/global | |
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/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 | 20 |
5 files changed, 29 insertions, 3 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 5adb699972..16f26f43bb 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; @@ -365,7 +364,9 @@ h3.fn, span.fn { margin: 0px; margin-top: 45px; } - +h3.fn code { + float: right; +} h3.fn:target { background-color: #F6F6D6; } @@ -711,8 +712,21 @@ Landing page float: left; } -.icons1of3 h2 { +.icons1of3 h2, .doc-column h2 { font-size: 15px; margin: 0px; padding: 0px; } + +div.multi-column { + position: relative; +} + +div.multi-column div { + display: -moz-inline-box; + display: inline-block; + vertical-align: top; + margin-top: 1em; + margin-right: 4em; + width: 24em; +} |