Merge remote branch 'qt/4.7' into 4.7

Conflicts:
	tools/qdoc3/test/qt-build-docs.qdocconf
	tools/qdoc3/test/qt.qdocconf

5 files changed, 3 insertions, 3 deletions

diff --git a/tests/auto/declarative/qmlvisual/shared/DejaVuSansMono.ttf b/tests/auto/declarative/qmlvisual/shared/DejaVuSansMono.ttf
new file mode 100644
index 0000000..029fcac
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/shared/DejaVuSansMono.ttf
diff --git a/tests/auto/declarative/qmlvisual/shared/TestText.qml b/tests/auto/declarative/qmlvisual/shared/TestText.qml
index be40112..ab624c3 100644
--- a/tests/auto/declarative/qmlvisual/shared/TestText.qml
+++ b/tests/auto/declarative/qmlvisual/shared/TestText.qml
@@ -2,7 +2,7 @@ import QtQuick 1.0
 import "../shared" 1.0
 
 Text{
-    FontLoader { id: fixedFont; source: "Vera.ttf" }
+    FontLoader { id: fixedFont; source: "DejaVuSansMono.ttf" }
     font.family: fixedFont.name
     font.pixelSize: 12
 }
diff --git a/tests/auto/declarative/qmlvisual/shared/TestTextEdit.qml b/tests/auto/declarative/qmlvisual/shared/TestTextEdit.qml
index e19e418..e7c5bc1 100644
--- a/tests/auto/declarative/qmlvisual/shared/TestTextEdit.qml
+++ b/tests/auto/declarative/qmlvisual/shared/TestTextEdit.qml
@@ -3,7 +3,7 @@ import "../shared" 1.0
 
 TextEdit {
     id: edit
-    FontLoader { id: fixedFont; source: "Vera.ttf" }
+    FontLoader { id: fixedFont; source: "DejaVuSansMono.ttf" }
     font.family: fixedFont.name
     font.pixelSize: 12
     cursorDelegate: Rectangle {
diff --git a/tests/auto/declarative/qmlvisual/shared/TestTextInput.qml b/tests/auto/declarative/qmlvisual/shared/TestTextInput.qml
index e01c2c2..64938e0 100644
--- a/tests/auto/declarative/qmlvisual/shared/TestTextInput.qml
+++ b/tests/auto/declarative/qmlvisual/shared/TestTextInput.qml
@@ -3,7 +3,7 @@ import "../shared" 1.0
 
 TextInput {
     id: inp
-    FontLoader { id: fixedFont; source: "Vera.ttf" }
+    FontLoader { id: fixedFont; source: "DejaVuSansMono.ttf" }
     font.family: fixedFont.name
     font.pixelSize: 12
     cursorDelegate: Rectangle {
diff --git a/tests/auto/declarative/qmlvisual/shared/Vera.ttf b/tests/auto/declarative/qmlvisual/shared/Vera.ttf
deleted file mode 100644
index 58cd6b5..0000000
--- a/tests/auto/declarative/qmlvisual/shared/Vera.ttf
+++ /dev/null