diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-19 12:08:44 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-19 12:08:44 (GMT) |
| commit | acb5cd795f4ea75794cfd31eaf768ec5a3e62844 (patch) | |
| tree | 28064e139d82b1f51c43b67c078855524b52821c /src/scripttools | |
| parent | 65e00180516eb136c2a7119dfe9e63fc9c66065e (diff) | |
| parent | 8e401cd4ae0133531613a3e097acc57979d78f50 (diff) | |
| download | Qt-acb5cd795f4ea75794cfd31eaf768ec5a3e62844.zip Qt-acb5cd795f4ea75794cfd31eaf768ec5a3e62844.tar.gz Qt-acb5cd795f4ea75794cfd31eaf768ec5a3e62844.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/scripttools')
| -rw-r--r-- | src/scripttools/debugging/qscriptdebuggercodefinderwidget.cpp | 2 | ||||
| -rw-r--r-- | src/scripttools/debugging/qscriptedit.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/scripttools/debugging/qscriptdebuggercodefinderwidget.cpp b/src/scripttools/debugging/qscriptdebuggercodefinderwidget.cpp index 8ed0aaa..e25bb04 100644 --- a/src/scripttools/debugging/qscriptdebuggercodefinderwidget.cpp +++ b/src/scripttools/debugging/qscriptdebuggercodefinderwidget.cpp @@ -143,7 +143,7 @@ QScriptDebuggerCodeFinderWidget::QScriptDebuggerCodeFinderWidget(QWidget *parent d->editFind = new QLineEdit(this); d->editFind->setMinimumSize(QSize(150, 0)); - connect(d->editFind, SIGNAL(textChanged(const QString&)), + connect(d->editFind, SIGNAL(textChanged(QString)), this, SLOT(_q_updateButtons())); connect(d->editFind, SIGNAL(returnPressed()), this, SLOT(_q_next())); diff --git a/src/scripttools/debugging/qscriptedit.cpp b/src/scripttools/debugging/qscriptedit.cpp index 7f0a5e0..67d82a3 100644 --- a/src/scripttools/debugging/qscriptedit.cpp +++ b/src/scripttools/debugging/qscriptedit.cpp @@ -110,8 +110,8 @@ QScriptEdit::QScriptEdit(QWidget *parent) QObject::connect(this, SIGNAL(blockCountChanged(int)), this, SLOT(updateExtraAreaWidth())); - QObject::connect(this, SIGNAL(updateRequest(const QRect &, int)), - this, SLOT(updateExtraArea(const QRect &, int))); + QObject::connect(this, SIGNAL(updateRequest(QRect,int)), + this, SLOT(updateExtraArea(QRect,int))); QObject::connect(this, SIGNAL(cursorPositionChanged()), this, SLOT(highlightCurrentLine())); |