diff options
-rw-r--r-- | .qmake.conf | 2 | ||||
-rw-r--r-- | examples/script/context2d/context2d.cpp | 8 | ||||
-rw-r--r-- | examples/script/qstetrix/tetrixboard.cpp | 6 | ||||
-rw-r--r-- | src/scripttools/debugging/qscriptbreakpointdata.cpp | 2 | ||||
-rw-r--r-- | src/scripttools/debugging/qscriptdebuggercommand.cpp | 2 | ||||
-rw-r--r-- | src/scripttools/debugging/qscriptdebuggerevent.cpp | 2 | ||||
-rw-r--r-- | src/scripttools/debugging/qscriptdebuggerresponse.cpp | 2 | ||||
-rw-r--r-- | src/scripttools/debugging/qscriptdebuggervalue.cpp | 2 | ||||
-rw-r--r-- | src/scripttools/debugging/qscriptdebuggervalueproperty.cpp | 2 | ||||
-rw-r--r-- | src/scripttools/debugging/qscriptedit.cpp | 8 | ||||
-rw-r--r-- | tests/auto/qscriptenginedebugger/tst_qscriptenginedebugger.cpp | 6 | ||||
-rw-r--r-- | tests/auto/qscriptvalue/tst_qscriptvalue.cpp | 2 |
12 files changed, 16 insertions, 28 deletions
diff --git a/.qmake.conf b/.qmake.conf index 2951612..1efc04d 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -3,4 +3,4 @@ android|boot2qt: CONFIG -= headersclean DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.12.3 +MODULE_VERSION = 5.13.0 diff --git a/examples/script/context2d/context2d.cpp b/examples/script/context2d/context2d.cpp index 831e017..5b8b9f6 100644 --- a/examples/script/context2d/context2d.cpp +++ b/examples/script/context2d/context2d.cpp @@ -470,7 +470,7 @@ void Context2D::clearRect(qreal x, qreal y, qreal w, qreal h) { beginPainting(); m_painter.save(); - m_painter.setMatrix(m_state.matrix, false); + m_painter.setTransform(QTransform(m_state.matrix), false); m_painter.setCompositionMode(QPainter::CompositionMode_Source); m_painter.fillRect(QRectF(x, y, w, h), QColor(0, 0, 0, 0)); m_painter.restore(); @@ -483,7 +483,7 @@ void Context2D::fillRect(qreal x, qreal y, qreal w, qreal h) { beginPainting(); m_painter.save(); - m_painter.setMatrix(m_state.matrix, false); + m_painter.setTransform(QTransform(m_state.matrix), false); m_painter.fillRect(QRectF(x, y, w, h), m_painter.brush()); m_painter.restore(); scheduleChange(); @@ -497,7 +497,7 @@ void Context2D::strokeRect(qreal x, qreal y, qreal w, qreal h) path.addRect(x, y, w, h); beginPainting(); m_painter.save(); - m_painter.setMatrix(m_state.matrix, false); + m_painter.setTransform(QTransform(m_state.matrix), false); m_painter.strokePath(path, m_painter.pen()); m_painter.restore(); scheduleChange(); @@ -624,7 +624,7 @@ void Context2D::stroke() { beginPainting(); m_painter.save(); - m_painter.setMatrix(m_state.matrix, false); + m_painter.setTransform(QTransform(m_state.matrix), false); QPainterPath tmp = m_state.matrix.inverted().map(m_path); m_painter.strokePath(tmp, m_painter.pen()); m_painter.restore(); diff --git a/examples/script/qstetrix/tetrixboard.cpp b/examples/script/qstetrix/tetrixboard.cpp index f92e9a7..914c6df 100644 --- a/examples/script/qstetrix/tetrixboard.cpp +++ b/examples/script/qstetrix/tetrixboard.cpp @@ -101,7 +101,7 @@ void TetrixBoard::showNextPiece(int width, int height) QPixmap pixmap(width * squareWidth(), height * squareHeight()); QPainter painter(&pixmap); - painter.fillRect(pixmap.rect(), nextPieceLabel()->palette().background()); + painter.fillRect(pixmap.rect(), nextPieceLabel()->palette().window()); emit paintNextPieceRequested(&painter); @@ -127,11 +127,11 @@ void TetrixBoard::drawSquare(QPainter *painter, int x, int y, int shape) painter->fillRect(x + 1, y + 1, squareWidth() - 2, squareHeight() - 2, color); - painter->setPen(color.light()); + painter->setPen(color.lighter()); painter->drawLine(x, y + squareHeight() - 1, x, y); painter->drawLine(x, y, x + squareWidth() - 1, y); - painter->setPen(color.dark()); + painter->setPen(color.darker()); painter->drawLine(x + 1, y + squareHeight() - 1, x + squareWidth() - 1, y + squareHeight() - 1); painter->drawLine(x + squareWidth() - 1, y + squareHeight() - 1, diff --git a/src/scripttools/debugging/qscriptbreakpointdata.cpp b/src/scripttools/debugging/qscriptbreakpointdata.cpp index 6c7ed28..505a861 100644 --- a/src/scripttools/debugging/qscriptbreakpointdata.cpp +++ b/src/scripttools/debugging/qscriptbreakpointdata.cpp @@ -345,7 +345,6 @@ bool QScriptBreakpointData::operator!=(const QScriptBreakpointData &other) const } /*! - \fn QDataStream &operator<<(QDataStream &stream, const QScriptBreakpointData &data) \relates QScriptBreakpointData Writes the given \a data to the specified \a stream. @@ -366,7 +365,6 @@ QDataStream &operator<<(QDataStream &out, const QScriptBreakpointData &data) } /*! - \fn QDataStream &operator>>(QDataStream &stream, QScriptBreakpointData &data) \relates QScriptBreakpointData Reads a QScriptBreakpointData from the specified \a stream into the diff --git a/src/scripttools/debugging/qscriptdebuggercommand.cpp b/src/scripttools/debugging/qscriptdebuggercommand.cpp index 2b8a26a..f264d28 100644 --- a/src/scripttools/debugging/qscriptdebuggercommand.cpp +++ b/src/scripttools/debugging/qscriptdebuggercommand.cpp @@ -656,7 +656,6 @@ QScriptDebuggerCommand QScriptDebuggerCommand::clearExceptionsCommand() } /*! - \fn QDataStream &operator<<(QDataStream &stream, const QScriptDebuggerCommand &command) \relates QScriptDebuggerCommand Writes the given \a command to the specified \a stream. @@ -675,7 +674,6 @@ QDataStream &operator<<(QDataStream &out, const QScriptDebuggerCommand &command) } /*! - \fn QDataStream &operator>>(QDataStream &stream, QScriptDebuggerCommand &command) \relates QScriptDebuggerCommand Reads a QScriptDebuggerCommand from the specified \a stream into the diff --git a/src/scripttools/debugging/qscriptdebuggerevent.cpp b/src/scripttools/debugging/qscriptdebuggerevent.cpp index efeb979..e4c59ff 100644 --- a/src/scripttools/debugging/qscriptdebuggerevent.cpp +++ b/src/scripttools/debugging/qscriptdebuggerevent.cpp @@ -267,7 +267,6 @@ bool QScriptDebuggerEvent::operator!=(const QScriptDebuggerEvent &other) const } /*! - \fn QDataStream &operator<<(QDataStream &stream, const QScriptDebuggerEvent &event) \relates QScriptDebuggerEvent Writes the given \a event to the specified \a stream. @@ -286,7 +285,6 @@ QDataStream &operator<<(QDataStream &out, const QScriptDebuggerEvent &event) } /*! - \fn QDataStream &operator>>(QDataStream &stream, QScriptDebuggerEvent &event) \relates QScriptDebuggerEvent Reads a QScriptDebuggerEvent from the specified \a stream into the diff --git a/src/scripttools/debugging/qscriptdebuggerresponse.cpp b/src/scripttools/debugging/qscriptdebuggerresponse.cpp index ee588ef..7eb4c18 100644 --- a/src/scripttools/debugging/qscriptdebuggerresponse.cpp +++ b/src/scripttools/debugging/qscriptdebuggerresponse.cpp @@ -310,7 +310,6 @@ bool QScriptDebuggerResponse::operator!=(const QScriptDebuggerResponse &other) c } /*! - \fn QDataStream &operator<<(QDataStream &stream, const QScriptDebuggerResponse &response) \relates QScriptDebuggerResponse Writes the given \a response to the specified \a stream. @@ -325,7 +324,6 @@ QDataStream &operator<<(QDataStream &out, const QScriptDebuggerResponse &respons } /*! - \fn QDataStream &operator>>(QDataStream &stream, QScriptDebuggerResponse &response) \relates QScriptDebuggerResponse Reads a QScriptDebuggerResponse from the specified \a stream into the diff --git a/src/scripttools/debugging/qscriptdebuggervalue.cpp b/src/scripttools/debugging/qscriptdebuggervalue.cpp index 2d0bcc2..46aba91 100644 --- a/src/scripttools/debugging/qscriptdebuggervalue.cpp +++ b/src/scripttools/debugging/qscriptdebuggervalue.cpp @@ -327,7 +327,6 @@ bool QScriptDebuggerValue::operator!=(const QScriptDebuggerValue &other) const } /*! - \fn QDataStream &operator<<(QDataStream &stream, const QScriptDebuggerValue &value) \relates QScriptDebuggerValue Writes the given \a value to the specified \a stream. @@ -357,7 +356,6 @@ QDataStream &operator<<(QDataStream &out, const QScriptDebuggerValue &value) } /*! - \fn QDataStream &operator>>(QDataStream &stream, QScriptDebuggerValue &value) \relates QScriptDebuggerValue Reads a QScriptDebuggerValue from the specified \a stream into the diff --git a/src/scripttools/debugging/qscriptdebuggervalueproperty.cpp b/src/scripttools/debugging/qscriptdebuggervalueproperty.cpp index f0c86d2..f46d3dd 100644 --- a/src/scripttools/debugging/qscriptdebuggervalueproperty.cpp +++ b/src/scripttools/debugging/qscriptdebuggervalueproperty.cpp @@ -175,7 +175,6 @@ bool QScriptDebuggerValueProperty::isValid() const } /*! - \fn QDataStream &operator<<(QDataStream &stream, const QScriptDebuggerValueProperty &property) \relates QScriptDebuggerValueProperty Writes the given \a property to the specified \a stream. @@ -190,7 +189,6 @@ QDataStream &operator<<(QDataStream &out, const QScriptDebuggerValueProperty &pr } /*! - \fn QDataStream &operator>>(QDataStream &stream, QScriptDebuggerValueProperty &property) \relates QScriptDebuggerValueProperty Reads a QScriptDebuggerValueProperty from the specified \a stream into the diff --git a/src/scripttools/debugging/qscriptedit.cpp b/src/scripttools/debugging/qscriptedit.cpp index d3d533f..c012a76 100644 --- a/src/scripttools/debugging/qscriptedit.cpp +++ b/src/scripttools/debugging/qscriptedit.cpp @@ -283,7 +283,7 @@ int QScriptEdit::extraAreaWidth() const max /= 10; ++digits; } - space += fm.width(QLatin1Char('9')) * digits; + space += fm.horizontalAdvance(QLatin1Char('9')) * digits; int markWidth = fm.lineSpacing(); space += markWidth; @@ -306,16 +306,16 @@ void QScriptEdit::extraAreaPaintEvent(QPaintEvent *e) int extraAreaWidth = m_extraArea->width(); QLinearGradient gradient(QPointF(extraAreaWidth - 10, 0), QPointF(extraAreaWidth, 0)); - gradient.setColorAt(0, pal.color(QPalette::Background)); + gradient.setColorAt(0, pal.color(QPalette::Window)); gradient.setColorAt(1, pal.color(QPalette::Base)); painter.fillRect(rect, gradient); QLinearGradient gradient2(QPointF(0, 0), QPointF(markWidth, 0)); gradient2.setColorAt(0, pal.color(QPalette::Dark)); - gradient2.setColorAt(1, pal.color(QPalette::Background)); + gradient2.setColorAt(1, pal.color(QPalette::Window)); painter.fillRect(rect.intersected(QRect(rect.x(), rect.y(), markWidth, rect.height())), gradient2); - painter.setPen(QPen(pal.color(QPalette::Background), 2)); + painter.setPen(QPen(pal.color(QPalette::Window), 2)); if (isLeftToRight()) painter.drawLine(rect.x() + extraAreaWidth-1, rect.top(), rect.x() + extraAreaWidth-1, rect.bottom()); else diff --git a/tests/auto/qscriptenginedebugger/tst_qscriptenginedebugger.cpp b/tests/auto/qscriptenginedebugger/tst_qscriptenginedebugger.cpp index 2161bec..4dc1c66 100644 --- a/tests/auto/qscriptenginedebugger/tst_qscriptenginedebugger.cpp +++ b/tests/auto/qscriptenginedebugger/tst_qscriptenginedebugger.cpp @@ -340,9 +340,9 @@ void tst_QScriptEngineDebugger::consoleCommands() debugger.attachTo(&engine); QWidget *consoleWidget = debugger.widget(QScriptEngineDebugger::ConsoleWidget); - QLineEdit *inputEdit = qFindChild<QLineEdit*>(consoleWidget); + QLineEdit *inputEdit = consoleWidget->findChild<QLineEdit*>(); QVERIFY(inputEdit != 0); - QPlainTextEdit *outputEdit = qFindChild<QPlainTextEdit*>(consoleWidget); + QPlainTextEdit *outputEdit = consoleWidget->findChild<QPlainTextEdit*>(); QVERIFY(outputEdit != 0); QVERIFY(outputEdit->toPlainText().startsWith("Welcome to the Qt Script debugger.")); @@ -351,7 +351,7 @@ void tst_QScriptEngineDebugger::consoleCommands() // print() { QWidget *debugOutputWidget = debugger.widget(QScriptEngineDebugger::DebugOutputWidget); - QPlainTextEdit *debugOutputEdit = qFindChild<QPlainTextEdit*>(debugOutputWidget); + QPlainTextEdit *debugOutputEdit = debugOutputWidget->findChild<QPlainTextEdit*>(); QVERIFY(debugOutputEdit != 0); QVERIFY(debugOutputEdit->toPlainText().isEmpty()); diff --git a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp index 47e040e..195fe0c 100644 --- a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp +++ b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp @@ -1267,7 +1267,7 @@ void tst_QScriptValue::toVariant() { QVariant var = qobject.toVariant(); QCOMPARE(var.userType(), int(QMetaType::QObjectStar)); - QCOMPARE(qVariantValue<QObject*>(var), (QObject *)this); + QCOMPARE(qvariant_cast<QObject*>(var), (QObject *)this); } { |