aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick
diff options
context:
space:
mode:
Diffstat (limited to 'src/quick')
-rw-r--r--src/quick/items/context2d/qquickcanvasitem.cpp2
-rw-r--r--src/quick/util/qdeclarativestyledtext.cpp4
-rw-r--r--src/quick/util/qdeclarativetransition.cpp1
3 files changed, 3 insertions, 4 deletions
diff --git a/src/quick/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp
index 53550b0b01..783fedf9fc 100644
--- a/src/quick/items/context2d/qquickcanvasitem.cpp
+++ b/src/quick/items/context2d/qquickcanvasitem.cpp
@@ -910,7 +910,7 @@ bool QQuickCanvasItem::createContext(const QString &contextType)
Q_D(QQuickCanvasItem);
if (contextType == QLatin1String("2d")) {
- if (d->contextType.compare("2d", Qt::CaseInsensitive) != 0) {
+ if (d->contextType.compare(QLatin1String("2d"), Qt::CaseInsensitive) != 0) {
d->contextType = QLatin1String("2d");
emit contextTypeChanged(); // XXX: can't be in setContextType()
}
diff --git a/src/quick/util/qdeclarativestyledtext.cpp b/src/quick/util/qdeclarativestyledtext.cpp
index 8c26194968..164e33cec1 100644
--- a/src/quick/util/qdeclarativestyledtext.cpp
+++ b/src/quick/util/qdeclarativestyledtext.cpp
@@ -690,9 +690,9 @@ void QDeclarativeStyledTextPrivate::parseImageAttributes(const QChar *&ch, const
QFontMetricsF fm(layout.font());
QString padding(qFloor(imgWidth / fm.width(QChar::Nbsp)), QChar::Nbsp);
- textOut += QChar(' ');
+ textOut += QLatin1Char(' ');
textOut += padding;
- textOut += QChar(' ');
+ textOut += QLatin1Char(' ');
}
QPair<QStringRef,QStringRef> QDeclarativeStyledTextPrivate::parseAttribute(const QChar *&ch, const QString &textIn)
diff --git a/src/quick/util/qdeclarativetransition.cpp b/src/quick/util/qdeclarativetransition.cpp
index c52ce92ec6..96e870df82 100644
--- a/src/quick/util/qdeclarativetransition.cpp
+++ b/src/quick/util/qdeclarativetransition.cpp
@@ -206,7 +206,6 @@ QDeclarativeTransition::QDeclarativeTransition(QObject *parent)
QDeclarativeTransition::~QDeclarativeTransition()
{
- Q_D(QDeclarativeTransition);
}
void QDeclarativeTransition::setReversed(bool r)