summaryrefslogtreecommitdiffstats
path: root/src/scripttools/debugging
diff options
context:
space:
mode:
authorFrans Englich <frans.englich@nokia.com>2009-11-20 12:19:09 (GMT)
committerFrans Englich <frans.englich@nokia.com>2009-11-20 12:19:09 (GMT)
commitb5294497836db44261c97cfeab28d0ac4f8402f1 (patch)
treec4331314445b41166ce2cd22a80c9fb9f46b5023 /src/scripttools/debugging
parent2473ab1cf217a989849190cbfa47fe312698adb9 (diff)
parent1b8d5bec5763708c66e7bd586aee3df7f94b5cb5 (diff)
downloadQt-b5294497836db44261c97cfeab28d0ac4f8402f1.zip
Qt-b5294497836db44261c97cfeab28d0ac4f8402f1.tar.gz
Qt-b5294497836db44261c97cfeab28d0ac4f8402f1.tar.bz2
Merge branch '4.6' into mmfphonon
Conflicts: demos/qmediaplayer/mediaplayer.cpp
Diffstat (limited to 'src/scripttools/debugging')
-rw-r--r--src/scripttools/debugging/qscriptdebuggercodefinderwidget.cpp2
-rw-r--r--src/scripttools/debugging/qscriptedit.cpp4
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()));