diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-08-03 01:00:16 +0200 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2018-08-07 17:44:51 +0200 |
commit | 053e7cce79d4bef99ec85101b0d22bbb171072c5 (patch) | |
tree | c2059e82cccdea1fd0024c5942d1a834c28d39da /doc | |
parent | a420d02538d28854914a6978c9637a0ddd652146 (diff) | |
parent | f271dd8f960ad9f61697dfa57b26c4071441cadc (diff) | |
download | qtbase-053e7cce79d4bef99ec85101b0d22bbb171072c5.tar.gz |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
src/corelib/doc/src/objectmodel/signalsandslots.qdoc
src/plugins/platforms/cocoa/qcocoamenuloader.mm
src/plugins/platforms/xcb/qxcbconnection.cpp
src/plugins/platforms/xcb/qxcbconnection.h
src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
src/plugins/platforms/xcb/qxcbwindow.cpp
tests/auto/gui/image/qimage/tst_qimage.cpp
Done-with: Gatis Paeglis <gatis.paeglis@qt.io>
Change-Id: I9bd24ee9b00d4f26c8f344ce3970aa6e93935ff5
Diffstat (limited to 'doc')
-rw-r--r-- | doc/global/externalsites/qtcreator.qdoc | 2 | ||||
-rw-r--r-- | doc/src/images/sliders-example.png | bin | 9317 -> 18048 bytes |
2 files changed, 1 insertions, 1 deletions
diff --git a/doc/global/externalsites/qtcreator.qdoc b/doc/global/externalsites/qtcreator.qdoc index d70f35b04c..98a5c9f12b 100644 --- a/doc/global/externalsites/qtcreator.qdoc +++ b/doc/global/externalsites/qtcreator.qdoc @@ -520,7 +520,7 @@ \title Qt Creator: Adding Debuggers */ /*! - \externalpage http://doc.qt.io/qtcreator/qtcreator-accelbubble-example.html + \externalpage http://doc.qt.io/qtcreator/qt-creator-accelbubble-example.html \title Qt Creator: Creating a Mobile Application */ /*! diff --git a/doc/src/images/sliders-example.png b/doc/src/images/sliders-example.png Binary files differindex a67ce1dbda..d2a9c4804d 100644 --- a/doc/src/images/sliders-example.png +++ b/doc/src/images/sliders-example.png |