diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-06-11 23:23:38 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-06-11 23:23:38 (GMT) |
| commit | b6cf52001e6c961f78fd3ebf19f09a94ddf52a97 (patch) | |
| tree | 958b0660a1d6313db9841f77693dd26ba0da05ff /src/gui/text/qtextcontrol.cpp | |
| parent | 344279da7e1cfbc4a28fd46931301d08ed9ef7d8 (diff) | |
| parent | 66f34c40dbc52b76434db4ccac6c43101bd57e1e (diff) | |
| download | Qt-b6cf52001e6c961f78fd3ebf19f09a94ddf52a97.zip Qt-b6cf52001e6c961f78fd3ebf19f09a94ddf52a97.tar.gz Qt-b6cf52001e6c961f78fd3ebf19f09a94ddf52a97.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
src/gui/graphicsview/qgraphicswidget.cpp
src/gui/painting/qdrawutil.cpp
src/gui/painting/qpainterpath.cpp
tools/qdoc3/test/qt-cpp-ignore.qdocconf
tools/qdoc3/test/qt-inc.qdocconf
Diffstat (limited to 'src/gui/text/qtextcontrol.cpp')
| -rw-r--r-- | src/gui/text/qtextcontrol.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/text/qtextcontrol.cpp b/src/gui/text/qtextcontrol.cpp index 0958b52..8573fc9 100644 --- a/src/gui/text/qtextcontrol.cpp +++ b/src/gui/text/qtextcontrol.cpp @@ -394,7 +394,7 @@ void QTextControlPrivate::init(Qt::TextFormat format, const QString &text, QText Q_Q(QTextControl); setContent(format, text, document); - QWidget *parentWidget = qobject_cast<QWidget*>(q->parent()); + QWidget *parentWidget = qobject_cast<QWidget*>(parent); if (parentWidget) { QTextOption opt = doc->defaultTextOption(); opt.setTextDirection(parentWidget->layoutDirection()); @@ -1712,7 +1712,7 @@ void QTextControlPrivate::mouseDoubleClickEvent(QEvent *e, Qt::MouseButton butto selectedWordOnDoubleClick = cursor; trippleClickPoint = pos; - trippleClickTimer.start(qApp->doubleClickInterval(), q); + trippleClickTimer.start(QApplication::doubleClickInterval(), q); if (doEmit) { selectionChanged(); #ifndef QT_NO_CLIPBOARD |