diff options
Diffstat (limited to 'src/scripttools/debugging')
14 files changed, 17 insertions, 17 deletions
diff --git a/src/scripttools/debugging/qscriptbreakpointswidget.cpp b/src/scripttools/debugging/qscriptbreakpointswidget.cpp index aaac47e..51059e2 100644 --- a/src/scripttools/debugging/qscriptbreakpointswidget.cpp +++ b/src/scripttools/debugging/qscriptbreakpointswidget.cpp @@ -70,7 +70,7 @@ public: system = QLatin1String("mac"); #else hboxLayout->setSpacing(6); - hboxLayout->setMargin(0); + hboxLayout->setContentsMargins(0, 0, 0, 0); #endif toolClose = new QToolButton(this); @@ -311,7 +311,7 @@ QScriptBreakpointsWidget::QScriptBreakpointsWidget(QWidget *parent) #endif QVBoxLayout *vbox = new QVBoxLayout(this); - vbox->setMargin(0); + vbox->setContentsMargins(0, 0, 0, 0); #ifndef QT_NO_TOOLBAR vbox->addWidget(toolBar); #endif diff --git a/src/scripttools/debugging/qscriptdebuggeragent.cpp b/src/scripttools/debugging/qscriptdebuggeragent.cpp index 5642dfe..7e25304 100644 --- a/src/scripttools/debugging/qscriptdebuggeragent.cpp +++ b/src/scripttools/debugging/qscriptdebuggeragent.cpp @@ -559,7 +559,7 @@ void QScriptDebuggerAgent::positionChange(qint64 scriptId, if (engine()->processEventsInterval() == -1) { // see if it's time to call processEvents() if ((++d->statementCounter % 25000) == 0) { - if (!d->processEventsTimer.isNull()) { + if (d->processEventsTimer.isValid()) { if (d->processEventsTimer.elapsed() > 30) { QCoreApplication::processEvents(); d->processEventsTimer.restart(); diff --git a/src/scripttools/debugging/qscriptdebuggeragent_p_p.h b/src/scripttools/debugging/qscriptdebuggeragent_p_p.h index 2e8be3a..1474032 100644 --- a/src/scripttools/debugging/qscriptdebuggeragent_p_p.h +++ b/src/scripttools/debugging/qscriptdebuggeragent_p_p.h @@ -52,7 +52,7 @@ // #include <QtScript/qscriptvalue.h> -#include <QtCore/qdatetime.h> +#include <QtCore/qelapsedtimer.h> #include <QtCore/qhash.h> #include <QtCore/qmap.h> #include <QtCore/qlist.h> @@ -113,7 +113,7 @@ public: QList<qint64> checkpointContextIdStack; qint64 nextContextId; - QTime processEventsTimer; + QElapsedTimer processEventsTimer; int statementCounter; QScriptDebuggerBackendPrivate *backend; diff --git a/src/scripttools/debugging/qscriptdebuggercodefinderwidget.cpp b/src/scripttools/debugging/qscriptdebuggercodefinderwidget.cpp index 5f60db6..a538234 100644 --- a/src/scripttools/debugging/qscriptdebuggercodefinderwidget.cpp +++ b/src/scripttools/debugging/qscriptdebuggercodefinderwidget.cpp @@ -130,7 +130,7 @@ QScriptDebuggerCodeFinderWidget::QScriptDebuggerCodeFinderWidget(QWidget *parent system = QLatin1String("mac"); #else hboxLayout->setSpacing(6); - hboxLayout->setMargin(0); + hboxLayout->setContentsMargins(0, 0, 0, 0); #endif d->toolClose = new QToolButton(this); diff --git a/src/scripttools/debugging/qscriptdebuggercodeview.cpp b/src/scripttools/debugging/qscriptdebuggercodeview.cpp index 7a3d8ed..19545b6 100644 --- a/src/scripttools/debugging/qscriptdebuggercodeview.cpp +++ b/src/scripttools/debugging/qscriptdebuggercodeview.cpp @@ -79,7 +79,7 @@ QScriptDebuggerCodeView::QScriptDebuggerCodeView(QWidget *parent) QObject::connect(d->editor, SIGNAL(breakpointEnableRequest(int,bool)), this, SIGNAL(breakpointEnableRequest(int,bool))); QVBoxLayout *vbox = new QVBoxLayout(this); - vbox->setMargin(0); + vbox->setContentsMargins(0, 0, 0, 0); vbox->addWidget(d->editor); } diff --git a/src/scripttools/debugging/qscriptdebuggercodewidget.cpp b/src/scripttools/debugging/qscriptdebuggercodewidget.cpp index 68c127f..23e1bf6 100644 --- a/src/scripttools/debugging/qscriptdebuggercodewidget.cpp +++ b/src/scripttools/debugging/qscriptdebuggercodewidget.cpp @@ -202,7 +202,7 @@ QScriptDebuggerCodeWidget::QScriptDebuggerCodeWidget(QWidget *parent) { Q_D(QScriptDebuggerCodeWidget); QVBoxLayout *vbox = new QVBoxLayout(this); - vbox->setMargin(0); + vbox->setContentsMargins(0, 0, 0, 0); d->viewStack = new QStackedWidget(); vbox->addWidget(d->viewStack); } diff --git a/src/scripttools/debugging/qscriptdebuggerconsolewidget.cpp b/src/scripttools/debugging/qscriptdebuggerconsolewidget.cpp index d1cdffc..5cf68b6 100644 --- a/src/scripttools/debugging/qscriptdebuggerconsolewidget.cpp +++ b/src/scripttools/debugging/qscriptdebuggerconsolewidget.cpp @@ -102,7 +102,7 @@ public: inputEdit = new InputEdit(); QHBoxLayout *hbox = new QHBoxLayout(this); hbox->setSpacing(0); - hbox->setMargin(0); + hbox->setContentsMargins(0, 0, 0, 0); hbox->addWidget(promptLabel); hbox->addWidget(inputEdit); @@ -323,7 +323,7 @@ QScriptDebuggerConsoleWidget::QScriptDebuggerConsoleWidget(QWidget *parent) d->outputEdit = new QScriptDebuggerConsoleWidgetOutputEdit(); QVBoxLayout *vbox = new QVBoxLayout(this); vbox->setSpacing(0); - vbox->setMargin(0); + vbox->setContentsMargins(0, 0, 0, 0); vbox->addWidget(d->outputEdit); vbox->addWidget(d->commandLine); diff --git a/src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp b/src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp index 9068534..25ca0fb 100644 --- a/src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp +++ b/src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp @@ -850,7 +850,7 @@ QVariant QScriptDebuggerLocalsModel::data(const QModelIndex &index, int role) co else if (role == Qt::BackgroundRole) { if (d->isTopLevelNode(node)) return QBrush(Qt::darkGray); - } else if (role == Qt::TextColorRole) { + } else if (role == Qt::ForegroundRole) { if (d->isTopLevelNode(node)) return QColor(Qt::white); } else if (role == Qt::FontRole) { diff --git a/src/scripttools/debugging/qscriptdebuggerlocalswidget.cpp b/src/scripttools/debugging/qscriptdebuggerlocalswidget.cpp index 67069ce..3f11c87 100644 --- a/src/scripttools/debugging/qscriptdebuggerlocalswidget.cpp +++ b/src/scripttools/debugging/qscriptdebuggerlocalswidget.cpp @@ -359,7 +359,7 @@ QScriptDebuggerLocalsWidget::QScriptDebuggerLocalsWidget(QWidget *parent) // d->view->header()->setResizeMode(QHeaderView::ResizeToContents); QVBoxLayout *vbox = new QVBoxLayout(this); - vbox->setMargin(0); + vbox->setContentsMargins(0, 0, 0, 0); vbox->addWidget(d->view); } diff --git a/src/scripttools/debugging/qscriptdebuggerscriptswidget.cpp b/src/scripttools/debugging/qscriptdebuggerscriptswidget.cpp index 83acb43..1ded58b 100644 --- a/src/scripttools/debugging/qscriptdebuggerscriptswidget.cpp +++ b/src/scripttools/debugging/qscriptdebuggerscriptswidget.cpp @@ -107,7 +107,7 @@ QScriptDebuggerScriptsWidget::QScriptDebuggerScriptsWidget(QWidget *parent) // d->view->header()->setResizeMode(QHeaderView::ResizeToContents); QVBoxLayout *vbox = new QVBoxLayout(this); - vbox->setMargin(0); + vbox->setContentsMargins(0, 0, 0, 0); vbox->addWidget(d->view); } diff --git a/src/scripttools/debugging/qscriptdebuggerstackwidget.cpp b/src/scripttools/debugging/qscriptdebuggerstackwidget.cpp index 2d5668a..f72968b 100644 --- a/src/scripttools/debugging/qscriptdebuggerstackwidget.cpp +++ b/src/scripttools/debugging/qscriptdebuggerstackwidget.cpp @@ -88,7 +88,7 @@ QScriptDebuggerStackWidget::QScriptDebuggerStackWidget(QWidget *parent) // d->view->header()->setResizeMode(QHeaderView::ResizeToContents); QVBoxLayout *vbox = new QVBoxLayout(this); - vbox->setMargin(0); + vbox->setContentsMargins(0, 0, 0, 0); vbox->addWidget(d->view); } diff --git a/src/scripttools/debugging/qscriptdebugoutputwidget.cpp b/src/scripttools/debugging/qscriptdebugoutputwidget.cpp index 1560098..a522519 100644 --- a/src/scripttools/debugging/qscriptdebugoutputwidget.cpp +++ b/src/scripttools/debugging/qscriptdebugoutputwidget.cpp @@ -100,7 +100,7 @@ QScriptDebugOutputWidget::QScriptDebugOutputWidget(QWidget *parent) Q_D(QScriptDebugOutputWidget); d->outputEdit = new QScriptDebugOutputWidgetOutputEdit(); QVBoxLayout *vbox = new QVBoxLayout(this); - vbox->setMargin(0); + vbox->setContentsMargins(0, 0, 0, 0); vbox->setSpacing(0); vbox->addWidget(d->outputEdit); diff --git a/src/scripttools/debugging/qscriptenginedebugger.cpp b/src/scripttools/debugging/qscriptenginedebugger.cpp index 1b39b72..dbaffb3 100644 --- a/src/scripttools/debugging/qscriptenginedebugger.cpp +++ b/src/scripttools/debugging/qscriptenginedebugger.cpp @@ -591,7 +591,7 @@ QMainWindow *QScriptEngineDebugger::standardWindow() const QWidget *central = new QWidget(); QVBoxLayout *vbox = new QVBoxLayout(central); - vbox->setMargin(0); + vbox->setContentsMargins(0, 0, 0, 0); vbox->addWidget(widget(CodeWidget)); vbox->addWidget(widget(CodeFinderWidget)); widget(CodeFinderWidget)->hide(); diff --git a/src/scripttools/debugging/qscripterrorlogwidget.cpp b/src/scripttools/debugging/qscripterrorlogwidget.cpp index 7359f04..165f0fd 100644 --- a/src/scripttools/debugging/qscripterrorlogwidget.cpp +++ b/src/scripttools/debugging/qscripterrorlogwidget.cpp @@ -95,7 +95,7 @@ QScriptErrorLogWidget::QScriptErrorLogWidget(QWidget *parent) Q_D(QScriptErrorLogWidget); d->outputEdit = new QScriptErrorLogWidgetOutputEdit(); QVBoxLayout *vbox = new QVBoxLayout(this); - vbox->setMargin(0); + vbox->setContentsMargins(0, 0, 0, 0); vbox->setSpacing(0); vbox->addWidget(d->outputEdit); |