Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7

Conflicts:
	src/gui/text/qfontengine_mac.mm
	tests/auto/qdiriterator/tst_qdiriterator.cpp

2 files changed, 5 insertions, 6 deletions

diff --git a/doc/src/snippets/accessibilityfactorysnippet.cpp b/doc/src/snippets/accessibilityfactorysnippet.cpp
index a378db7..6dc6b2a 100644
--- a/doc/src/snippets/accessibilityfactorysnippet.cpp
+++ b/doc/src/snippets/accessibilityfactorysnippet.cpp
@@ -45,9 +45,8 @@ QAccessibleInterface *sliderFactory(const QString &classname, QObject *object)
 {
     QAccessibleInterface *interface = 0;
 
-    if (classname == "QSlider" && object && object->isWidgetType())
-        interface = new SliderInterface(classname,
-                                        static_cast<QWidget *>(object));
+    if (classname == QLatin1String("QSlider") && object && object->isWidgetType())
+        interface = new QAccessibleSlider(static_cast<QWidget *>(object));
     
     return interface;
 }
diff --git a/doc/src/snippets/accessibilitypluginsnippet.cpp b/doc/src/snippets/accessibilitypluginsnippet.cpp
index a7e25f0..5c28468 100644
--- a/doc/src/snippets/accessibilitypluginsnippet.cpp
+++ b/doc/src/snippets/accessibilitypluginsnippet.cpp
@@ -52,7 +52,7 @@ public:
 //! [0]
 QStringList SliderPlugin::keys() const
 {
-    return QStringList() << "QSlider";
+    return QStringList() << QLatin1String("QSlider");
 }
 //! [0]
 
@@ -61,8 +61,8 @@ QAccessibleInterface *SliderPlugin::create(const QString &classname, QObject *ob
 {
     QAccessibleInterface *interface = 0;
 
-    if (classname == "QSlider" && object && object->isWidgetType())
-        interface = new AccessibleSlider(classname, static_cast<QWidget *>(object));
+    if (classname == QLatin1String("QSlider") && object && object->isWidgetType())
+        interface = new QAccessibleSlider(static_cast<QWidget *>(object));
 
     return interface;
 }