diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-04-20 09:29:40 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-04-20 09:29:40 (GMT) |
| commit | 33afa6c1fbe230dec4eea435f9ad5d4141c128a8 (patch) | |
| tree | 2ace5c779c10288503b348a8d8bac8748dad0cae /src/scripttools/debugging/qscriptedit.cpp | |
| parent | ee1e6222114028c2ff181f972e32f15011723b5f (diff) | |
| parent | 9f668a352df15404234ea30bc9bb0c1ef774c1b0 (diff) | |
| download | Qt-33afa6c1fbe230dec4eea435f9ad5d4141c128a8.zip Qt-33afa6c1fbe230dec4eea435f9ad5d4141c128a8.tar.gz Qt-33afa6c1fbe230dec4eea435f9ad5d4141c128a8.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-multitouch
Diffstat (limited to 'src/scripttools/debugging/qscriptedit.cpp')
| -rw-r--r-- | src/scripttools/debugging/qscriptedit.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/scripttools/debugging/qscriptedit.cpp b/src/scripttools/debugging/qscriptedit.cpp index 2bc0a40..7c2a72c 100644 --- a/src/scripttools/debugging/qscriptedit.cpp +++ b/src/scripttools/debugging/qscriptedit.cpp @@ -342,11 +342,9 @@ void QScriptEdit::extraAreaPaintEvent(QPaintEvent *e) icon.paint(&painter, r, Qt::AlignCenter); } -#if QT_VERSION >= 0x040500 if (!m_executableLineNumbers.contains(lineNumber)) painter.setPen(pal.color(QPalette::Mid)); else -#endif painter.setPen(QColor(Qt::darkCyan)); QString number = QString::number(lineNumber); painter.drawText(rect.x() + markWidth, (int)top, rect.x() + extraAreaWidth - markWidth - 4, @@ -370,10 +368,8 @@ void QScriptEdit::extraAreaMouseEvent(QMouseEvent *e) if (e->type() == QEvent::MouseMove && e->buttons() == 0) { // mouse tracking bool hand = (e->pos().x() <= markWidth); -#if QT_VERSION >= 0x040500 int lineNumber = cursor.blockNumber() + m_baseLineNumber; hand = hand && m_executableLineNumbers.contains(lineNumber); -#endif #ifndef QT_NO_CURSOR if (hand != (m_extraArea->cursor().shape() == Qt::PointingHandCursor)) m_extraArea->setCursor(hand ? Qt::PointingHandCursor : Qt::ArrowCursor); @@ -382,12 +378,8 @@ void QScriptEdit::extraAreaMouseEvent(QMouseEvent *e) if (e->type() == QEvent::MouseButtonPress) { if (e->button() == Qt::LeftButton) { -#if QT_VERSION >= 0x040500 int lineNumber = cursor.blockNumber() + m_baseLineNumber; bool executable = m_executableLineNumbers.contains(lineNumber); -#else - bool executable = true; -#endif if ((e->pos().x() <= markWidth) && executable) m_extraAreaToggleBlockNumber = cursor.blockNumber(); else @@ -402,10 +394,8 @@ void QScriptEdit::extraAreaMouseEvent(QMouseEvent *e) } } else if (e->button() == Qt::RightButton) { int lineNumber = cursor.blockNumber() + m_baseLineNumber; -#if QT_VERSION >= 0x040500 if (!m_executableLineNumbers.contains(lineNumber)) return; -#endif bool has = m_breakpoints.contains(lineNumber); QMenu *popup = new QMenu(); QAction *toggleAct = new QAction(QObject::tr("Toggle Breakpoint"), popup); |