diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-04-07 13:13:08 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-04-07 13:14:27 (GMT) |
| commit | 7c8980ee041e874a6c430f01b2daff4955517b03 (patch) | |
| tree | aa19249a7fb469176fb22adfa9a1b702ae3be6c0 /doc/src/snippets/accessibilityfactorysnippet.cpp | |
| parent | 8031eada2f81963865390b4d899631b09d4ca6f3 (diff) | |
| parent | a05f73499a187c67a394893e2cc74516ccbc46f5 (diff) | |
| download | Qt-7c8980ee041e874a6c430f01b2daff4955517b03.zip Qt-7c8980ee041e874a6c430f01b2daff4955517b03.tar.gz Qt-7c8980ee041e874a6c430f01b2daff4955517b03.tar.bz2 | |
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
Diffstat (limited to 'doc/src/snippets/accessibilityfactorysnippet.cpp')
| -rw-r--r-- | doc/src/snippets/accessibilityfactorysnippet.cpp | 5 |
1 files changed, 2 insertions, 3 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; } |