diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-02-15 10:23:33 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-16 08:31:17 +0100 |
commit | fbddf793e94b851219fd1c7e71f857099db1cd33 (patch) | |
tree | f8e34e6304b52294c6a2ec7dcaa1ffa656dda34b /src/quick | |
parent | 0d1f29c6e026a6656430aa601ebc25459015d53e (diff) |
QtDeclarative/Quick: Fix warnings.
Change-Id: I71bd638fcc41356e0b76df27ec76ad3ed5ef90d9
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'src/quick')
-rw-r--r-- | src/quick/items/context2d/qquickcanvasitem.cpp | 2 | ||||
-rw-r--r-- | src/quick/util/qdeclarativestyledtext.cpp | 4 | ||||
-rw-r--r-- | src/quick/util/qdeclarativetransition.cpp | 1 |
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) |