Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/boldLinkingforQt5.4 into lp:ubuntu-ui-toolkit/staging

[Cris Dywan]

Change offending links into bold font

[Timo Jyrinki (timo-jyrinki)]

I cannot now test this fix at the moment, since as of 5.4.0 RC there is a new build problem with UITK bug #1397979

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1353
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1287/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/402
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/20/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/20/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/20/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/358
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/402
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/402/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16320

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1287/rebuild

review: Needs Fixing (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

Succeeded with 5.4 RC! Thanks!

https://launchpad.net/~canonical-qt5-edgers/+archive/ubuntu/qt5-beta2/+sourcepub/4598501/+listing-archive-extra

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'modules/Ubuntu/Components/AbstractButton.qml'
--- modules/Ubuntu/Components/AbstractButton.qml	2014-11-28 08:19:13 +0000
+++ modules/Ubuntu/Components/AbstractButton.qml	2014-11-28 13:31:36 +0000
@@ -40,7 +40,7 @@
 
     /*!
        This handler is called when there is a mouse click on the button
-       and the button is not disabled. If \l action is defined,
+       and the button is not disabled. If \b action is defined,
        the action will be triggered.
     */
     signal clicked()

=== modified file 'modules/Ubuntu/Components/Page.qdoc'
--- modules/Ubuntu/Components/Page.qdoc	2014-06-27 13:27:56 +0000
+++ modules/Ubuntu/Components/Page.qdoc	2014-11-28 13:31:36 +0000
@@ -71,7 +71,7 @@
     \qmlproperty Item Page::tools
     \deprecated
     The toolbar items associated with this Page.
-    DEPRECATED. Use \l head.actions instead.
+    DEPRECATED. Use \b head.actions instead.
  */
 
 /*!

=== modified file 'modules/Ubuntu/Components/plugin/ucaction.cpp'
--- modules/Ubuntu/Components/plugin/ucaction.cpp	2014-09-16 05:49:26 +0000
+++ modules/Ubuntu/Components/plugin/ucaction.cpp	2014-11-28 13:31:36 +0000
@@ -28,8 +28,8 @@
  *
  * Actions can be used to define a specific task to be executed in different
  * contexts using different components. The same action can be assigned to
- * a \l Button, a \l Checkbox or even a \l TextField. The \l triggered signal
- * is emitted depending on the component. \l Button and \l CheckBox for instance
+ * a \l Button, a \b Checkbox or even a \l TextField. The \l triggered signal
+ * is emitted depending on the component. \l Button and \b CheckBox for instance
  * emits the signal when clicked, whereas \l TextField emits the signal when
  * its accepted signal is triggered.
  *