Merge lp:~kalikiana/ubuntu-ui-toolkit/docConditionals into lp:ubuntu-ui-toolkit

[Cris Dywan]

Conditionally define doc folder containing resources

[Timo Jyrinki (timo-jyrinki)]

This branch is more related to Qt 5.1 and the doc parts mentioned at bug #1217331, but not sure if those changes are even relevant or at least the bug #1256779 is bumped into first with Qt 5.2.

[Timo Jyrinki (timo-jyrinki)]

Ah, correction, this probably fixes the "not found" errors also on Qt 5.2, but it still stops at the No documentation for 'global'.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:879
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1383/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1380
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1353
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/331
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/331
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/331/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1228
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1380
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1380/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1353
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1353/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3891
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/2015

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1383/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:881
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1433/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1563/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1514/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/381/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/381/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1563/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1514/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1433/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:882
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1436/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1572/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1522/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/384
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/384
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/384/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1394/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1572
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1572/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1522
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1522/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4046/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/2207

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1436/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:883
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1440/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1592
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1539
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/388
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/388
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/388/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1412
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1592
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1592/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1539
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1539/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4061
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/2226

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1440/rebuild

review: Approve (continuous-integration)

[Zsombor Egri (zsombi)]

Looks fine, works with 5.0.2 too, so let's get it in. Thanks!

review: Approve

[Timo Jyrinki (timo-jyrinki)]

w00t, I see awesomeness at:
https://launchpad.net/~canonical-qt5-edgers/+archive/qt5-beta1/+sourcepub/3720712/+listing-archive-extra

Great!

review: Approve

[Timo Jyrinki (timo-jyrinki)]

Ah, just a second, wrong PPA...

[Timo Jyrinki (timo-jyrinki)]

So far as awesome also against Qt 5.2, so let's just put it in:

https://launchpad.net/~canonical-qt5-edgers/+archive/qt5-daily/+sourcepub/3720750/+listing-archive-extra

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-autolanding/510/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1601
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1548/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-autolanding/113
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-autolanding/113
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-autolanding/113/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1418
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1601
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1601/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1548
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1548/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4068/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/2233

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-autolanding/511/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1628
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1570/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-autolanding/114
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-autolanding/114/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1443
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1628
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1628/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1570
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1570/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4088/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/2260

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-autolanding/512/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1629
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1571
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-autolanding/115
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-autolanding/115/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1444
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1629
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1629/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1571
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1571/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4089
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/2261

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-autolanding/513/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1630
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1572/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-autolanding/116
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-autolanding/116
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-autolanding/116/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1445
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1630
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1630/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1572/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'components.api'
--- components.api	2013-12-09 06:27:48 +0000
+++ components.api	2013-12-11 11:30:05 +0000
@@ -300,7 +300,7 @@
 PopupBase
     default property list<Object> container
     property real contentWidth
-    property internal contentHeight
+    property real contentHeight
     property Item caller
     property Item pointerTarget
     property real edgeMargins
@@ -488,8 +488,8 @@
     property string text
     property Validator validator
     property enumeration horizontalAlignment
-    property internal effectiveHorizontalAlignment
-    property internal verticalAlignment
+    property enumeration effectiveHorizontalAlignment
+    property enumeration verticalAlignment
     property string passwordCharacter
     property color selectionColor
     property color selectedTextColor

=== modified file 'documentation/ubuntu-ui-toolkit-offline.qdocconf'
--- documentation/ubuntu-ui-toolkit-offline.qdocconf	2013-06-25 15:38:56 +0000
+++ documentation/ubuntu-ui-toolkit-offline.qdocconf	2013-12-11 11:30:05 +0000
@@ -2,11 +2,11 @@
 HTML.nobreadcrumbs = "true"
 
 HTML.stylesheets = \
-    documentation/css/breadcrumbs.js \
-    documentation/css/reset.css \
-    documentation/css/qtquick.css \
-    documentation/css/base.css \
-    documentation/css/scratch.css
+    $SRC/css/breadcrumbs.js \
+    $SRC/css/reset.css \
+    $SRC/css/qtquick.css \
+    $SRC/css/base.css \
+    $SRC/css/scratch.css
 
 HTML.headerstyles = \
   "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/reset.css\" />\n" \

=== modified file 'modules/Ubuntu/Components/ListItems/Empty.qml'
--- modules/Ubuntu/Components/ListItems/Empty.qml	2013-11-18 11:27:49 +0000
+++ modules/Ubuntu/Components/ListItems/Empty.qml	2013-12-11 11:30:05 +0000
@@ -158,7 +158,7 @@
 
     /*!
       \preliminary
-      \qmlproperty ThinDivider bottomDividerLine
+      \qmlproperty ThinDivider divider
       Exposes our the bottom line divider.
      */
     property alias divider: bottomDividerLine

=== modified file 'modules/Ubuntu/Components/Popups/Popover.qml'
--- modules/Ubuntu/Components/Popups/Popover.qml	2013-08-21 15:27:14 +0000
+++ modules/Ubuntu/Components/Popups/Popover.qml	2013-12-11 11:30:05 +0000
@@ -104,7 +104,6 @@
       The properties can be used to alter the default content width and heights.
       */
     property alias contentWidth: foreground.width
-    /*! \internal */
     property alias contentHeight: foreground.height
 
     /*!
@@ -144,7 +143,7 @@
     property bool autoClose: true
 
     /*!
-      \qmlproperty Component style
+      \qmlproperty Component foregroundStyle
       Exposes the style property of the \l StyledItem contained in the Popover.
       Refer to \l StyledItem how to use it.
       */

=== modified file 'modules/Ubuntu/Components/TextField.qml'
--- modules/Ubuntu/Components/TextField.qml	2013-11-06 22:52:15 +0000
+++ modules/Ubuntu/Components/TextField.qml	2013-12-11 11:30:05 +0000
@@ -543,9 +543,7 @@
       \qmlproperty enumeration verticalAlignment
     */
     property alias horizontalAlignment: editor.horizontalAlignment
-    /*! \internal */
     property alias effectiveHorizontalAlignment: editor.effectiveHorizontalAlignment
-    /*! \internal */
     property alias verticalAlignment: editor.verticalAlignment
 
     /*!
@@ -570,7 +568,7 @@
     /*!
       The highlighted text color, used in selections.
 
-      \qmlproperty color selctedTextColor
+      \qmlproperty color selectedTextColor
       */
     property alias selectedTextColor: editor.selectedTextColor
 

=== modified file 'tests/qmlapicheck.py'
--- tests/qmlapicheck.py	2013-11-29 16:58:22 +0000
+++ tests/qmlapicheck.py	2013-12-11 11:30:05 +0000
@@ -70,7 +70,8 @@
     if fileinput.isfirstline():
         in_block = 0
         in_comment = in_builtin_type = False
-        annotated_type = None
+        block_meta = {}
+        annotated_properties = {}
         if fileinput.filename()[-3:] == 'qml':
             filetype = 'qml'
             keywords = ['signal', 'property', 'function']
@@ -89,9 +90,16 @@
     line = line.split('//')[0]
     # alias properties only define their type through qdoc comments
     if '\\qmlproperty' in line:
-        annotated_type = line
+        words = line.strip().split(' ')
+        name = words[2]
+        # Strip namespace
+        if '::' in name:
+            name = name.split('::')[1]
+        type = words[1]
+        annotated_properties[name] = type
     elif '\\internal' in line:
-        annotated_type = 'internal internal internal'
+        # internal without type always relates to the next declared property
+        annotated_properties['internal'] = 'internal'
 
     if '/*' in line and not '*/' in line:
         in_comment = True
@@ -110,6 +118,7 @@
     # End of function/ signal/ Item block
     if '}' in line:
         in_block -= 1
+        block_meta = {}
         if in_block == 1 and in_builtin_type:
             in_builtin_type = False
         continue
@@ -120,7 +129,7 @@
         declaration = line.split(':')[0]
         words = declaration.strip().split(' ')
         # Skip types with prefixes considered builtin
-        if words[0] == 'name':
+        if filetype == 'qmltypes' and words[0] == 'name':
             found_builtin_type = False
             for builtin in builtins:
                 if '"' + builtin in line:
@@ -129,6 +138,15 @@
             if found_builtin_type:
                 in_builtin_type = True
                 continue
+            if 'prototype' in block_meta:
+                print('    ' + block_meta['prototype'].strip())
+                print('    ' + line.strip())
+                continue
+
+        block_meta[words[0]] = line
+        # Omit prototype if it comes before the name since we may skip it
+        if not 'name' in block_meta and words[0] == 'prototype':
+            continue
 
         # Don't consider the qml variable name as a keyword
         if filetype == 'qml':
@@ -142,13 +160,20 @@
                 if filetype == 'qml':
                     signature = declaration.split('{')[0].strip()
                     if 'alias' in line:
-                        if not annotated_type:
+                        no_mods = signature
+                        for mod in ['readonly', 'default']:
+                            no_mods = no_mods.replace(mod, '')
+                        name = no_mods.strip().split(' ')[2]
+                        if 'internal' in annotated_properties:
+                            if not name in annotated_properties:
+                                annotated_properties[name] = 'internal'
+                            del annotated_properties['internal']
+                        if not name in annotated_properties:
                             print('    %s' % (signature))
-                            print('Error: Missing \\qmlproperty annotation')
+                            print('Error: Missing \\qmlproperty for %s' % name)
                             sys.exit(1)
-                        real_type = annotated_type.strip().split(' ')[1]
+                        real_type = annotated_properties[name]
                         signature = signature.replace('alias', real_type)
-                    annotated_type = None
                 elif filetype == 'qmltypes':
                     signature = line.strip()
                 if not in_builtin_type:
@@ -158,6 +183,7 @@
     # Start of function/ signal/ Item block
     if '{' in line:
         in_block += 1
+        block_meta = {}
         # The parent type can affect API
         if in_block == 1 and filetype == 'qml':
             print(line.split('{')[0].strip())

=== modified file 'tests/unit/add_qmlmakecheck.pri'
--- tests/unit/add_qmlmakecheck.pri	2013-12-02 11:23:19 +0000
+++ tests/unit/add_qmlmakecheck.pri	2013-12-11 11:30:05 +0000
@@ -9,5 +9,6 @@
 }
 check.commands += cd ../../..;
 check.commands += qmlplugindump Ubuntu.Components 0.1 modules > plugins.qmltypes;
-check.commands += BUILTINS=QQuick,QQml,U1db:: python tests/qmlapicheck.py modules/Ubuntu/Components/qmldir modules/Ubuntu/Components/Colors/UbuntuColors.qml modules/Ubuntu/Components/*/qmldir plugins.qmltypes > components.api.new;
+# Palette gets included in Qt 5.2 qmlplugindump even though it's qml
+check.commands += BUILTINS=QQuick,QQml,U1db::,Palette python tests/qmlapicheck.py modules/Ubuntu/Components/qmldir modules/Ubuntu/Components/Colors/UbuntuColors.qml modules/Ubuntu/Components/*/qmldir plugins.qmltypes > components.api.new;
 check.commands += diff -Fqml -u components.api components.api.new || exit 1; cd tests/unit

=== modified file 'ubuntu-sdk.pro'
--- ubuntu-sdk.pro	2013-12-09 11:33:51 +0000
+++ ubuntu-sdk.pro	2013-12-11 11:30:05 +0000
@@ -35,19 +35,25 @@
 license.commands = ./tests/license/checklicense.sh
 QMAKE_EXTRA_TARGETS += license
 
+DOC_SRC = .
+equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 2) {
+    DOC_SRC = documentation
+}
+
 DOC_PATH=$$system(pwd)/documentation
 docs.target = docs
 # Offline docs for QtCreator
-docs.commands += qdoc $$DOC_PATH/ubuntu-ui-toolkit-qtcreator.qdocconf 2> $$DOC_PATH/qdoc.err;
-docs.commands += cat $$DOC_PATH/qdoc.err;
+docs.commands += SRC=$$DOC_SRC qdoc $$DOC_PATH/ubuntu-ui-toolkit-qtcreator.qdocconf 2> $$DOC_PATH/qdoc.err;
+# FIXME: With Qt 5.2 this warning shows up, forcibly omit it from errors
+docs.commands += cat $$DOC_PATH/qdoc.err | grep -v \"qdoc: warning: No documentation for \'global\'\" > $$DOC_PATH/qdoc.err;
 docs.commands += test ! -s $$DOC_PATH/qdoc.err || exit 1;
 docs.commands += qhelpgenerator -o "$$DOC_PATH/html/ubuntuuserinterfacetoolkit.qch" "$$DOC_PATH/html/ubuntuuserinterfacetoolkit.qhp";
 # Online docs. Run qdoc twice: the second run with indexes for cross-referencing
 # other APIs but discard errors because qdoc inherits all doc bugs otherwise
-docs.commands += qdoc $$DOC_PATH/ubuntu-ui-toolkit-online.qdocconf 2> $$DOC_PATH/qdoc.err;
-docs.commands += cat $$DOC_PATH/qdoc.err;
+docs.commands += SRC=$$DOC_SRC qdoc $$DOC_PATH/ubuntu-ui-toolkit-online.qdocconf 2> $$DOC_PATH/qdoc.err;
+docs.commands += cat $$DOC_PATH/qdoc.err | grep -v \"qdoc: warning: No documentation for \'global\'\" > $$DOC_PATH/qdoc.err;
 docs.commands += test ! -s $$DOC_PATH/qdoc.err || exit 1;
-docs.commands += qdoc $$DOC_PATH/ubuntu-ui-toolkit-online-indexes.qdocconf 2> /dev/null;
+docs.commands += SRC=$$DOC_SRC qdoc $$DOC_PATH/ubuntu-ui-toolkit-online-indexes.qdocconf 2> /dev/null;
 docs.commands += $$DOC_PATH/fix-markup.sh $$DOC_PATH;
 QMAKE_EXTRA_TARGETS += docs