aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVenugopal Shivashankar <Venugopal.Shivashankar@qt.io>2017-10-09 10:24:41 +0200
committerTopi Reiniƶ <topi.reinio@qt.io>2017-10-11 08:31:46 +0000
commit268624dae3553bce3c5bbc6d0f43704312982cb9 (patch)
treea5bc4d3937f57f54653a1187fcef06c2652bab50
parent552b8b53ff0c28e4b172cdf55bd1cd179b03fafd (diff)
Doc: Remove reference to $PWD variable in the doc config
Apparently the environment variable is not resolved on Windows platform, leading to documentation build failure. Task-number: QTBUG-63626 Change-Id: Ia37a3f7f35007f6756f1b99422d7d6b70b9ae10f Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
-rw-r--r--src/imports/controls/doc/manifest-meta.qdocconf10
-rw-r--r--src/imports/controls/doc/qtquickcontrols2.qdocconf2
2 files changed, 6 insertions, 6 deletions
diff --git a/src/imports/controls/doc/manifest-meta.qdocconf b/src/imports/controls/doc/manifest-meta.qdocconf
index 74dbb41f..3d39e0a1 100644
--- a/src/imports/controls/doc/manifest-meta.qdocconf
+++ b/src/imports/controls/doc/manifest-meta.qdocconf
@@ -28,8 +28,8 @@
# manifestmeta.global.names = *
# manifestmeta.global.tags = qt5
-manifestmeta.highlighted.names += "QtQuickControls2/Qt Quick Controls 2 - Gallery" \
- "QtQuickControls2/Qt Quick Controls 2 - Wearable Demo" \
- "QtQuickControls2/Qt Quick Controls 2 - Text Editor" \
- "QtQuickControls2/Qt Quick Controls 2 - Contact List" \
- "QtQuickControls2/Qt Quick Controls 2 - Side Panel"
+manifestmeta.highlighted.names = "QtQuickControls2/Qt Quick Controls 2 - Gallery" \
+ "QtQuickControls2/Qt Quick Controls 2 - Wearable Demo" \
+ "QtQuickControls2/Qt Quick Controls 2 - Text Editor" \
+ "QtQuickControls2/Qt Quick Controls 2 - Contact List" \
+ "QtQuickControls2/Qt Quick Controls 2 - Side Panel"
diff --git a/src/imports/controls/doc/qtquickcontrols2.qdocconf b/src/imports/controls/doc/qtquickcontrols2.qdocconf
index 225b7bea..da5b7e38 100644
--- a/src/imports/controls/doc/qtquickcontrols2.qdocconf
+++ b/src/imports/controls/doc/qtquickcontrols2.qdocconf
@@ -1,5 +1,5 @@
include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
-include($PWD/manifest-meta.qdocconf)
+include(manifest-meta.qdocconf)
project = QtQuickControls2
description = Qt Quick Controls 2 Reference Documentation