Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: (1968 commits)
  Doc: Fixed spelling errors that were blocking the CI system.
  Added missing license headers.
  DEF file updates for Symbian
  QTBUG-19883 Adding top level TRAP for QThreads on Symbian
  Added missing license headers.
  Revert "QFileInfoGatherer: call QFileSystemWatcher addPaths from proper thread"
  Fix alignment value not handled in ODF
  Silence a compiler warning about unhandled enum in switch
  Silence the "array out of bounds" warning in GCC 4.6.
  Silence the callgrind warnings in our source code when using gcc 4.6
  Create a function that merges the SSE common code
  Improve toLatin1 x86 SIMD by using a new SSE4.1 instruction
  Revert "Fix compilation of lrelease on Windows"
  QFileInfoGatherer: call QFileSystemWatcher addPaths from proper thread
  Also test http proxy in the QTcpServer benchmark
  Symbian QFileSystemWatcher: fix potential crash
  Enable QTcpServer benchmark on symbian
  Fix building the OpenVG graphicssystem on Linux with static libs
  fix build on windows 7
  Fix compilation of lrelease on Windows
  ...

1 files changed, 3 insertions, 3 deletions

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;
 }