diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-18 12:12:58 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-18 12:12:58 +0100 |
| commit | e281537f2049af0b96fd87158f2b7212afe8ab5f (patch) | |
| tree | 7f9e3b14a2456cc779aa165457192094507dd257 /doc | |
| parent | e0a8b5ce88bc50440dcec2fe3a86d83e2a7dc7b0 (diff) | |
| parent | 84569773db68408704193268bc42a200bb25a924 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/corelib/global/qglobal.h
src/platformsupport/platformcompositor/qopenglcompositor.cpp
src/platformsupport/platformcompositor/qopenglcompositorbackingstore.cpp
tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
Change-Id: I5422868500be695584a496dbbbc719d146bc572d
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/global/externalsites/qt-webpages.qdoc | 2 | ||||
| -rw-r--r-- | doc/global/html-header-online.qdocconf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/global/externalsites/qt-webpages.qdoc b/doc/global/externalsites/qt-webpages.qdoc index fabead9747..db946b41da 100644 --- a/doc/global/externalsites/qt-webpages.qdoc +++ b/doc/global/externalsites/qt-webpages.qdoc @@ -29,7 +29,7 @@ \title Qt Homepage */ /*! - \externalpage http://bugreports.qt-project.org + \externalpage http://bugreports.qt.io \title Qt Bug Tracker */ /*! diff --git a/doc/global/html-header-online.qdocconf b/doc/global/html-header-online.qdocconf index 7e9aae66f1..049b649b97 100644 --- a/doc/global/html-header-online.qdocconf +++ b/doc/global/html-header-online.qdocconf @@ -117,7 +117,7 @@ HTML.postheader = \ " <li><a href=\"http://qt-project.org/wiki\">Wiki</a></li>\n" \ " <li><a href=\"http://doc.qt.io/\" class=\"active\">Documentation</a></li>\n" \ " <li><a href=\"http://qt-project.org/forums\">Forum</a></li>\n" \ - " <li><a href=\"https://bugreports.qt-project.org/\">Bug Reports</a></li>\n" \ + " <li><a href=\"https://bugreports.qt.io/\">Bug Reports</a></li>\n" \ " <li><a href=\"https://codereview.qt-project.org/\">Code Review</a></li>\n" \ " </ul>\n" \ " <div id=\"main_title_bar\">\n" \ |