diff options
-rw-r--r-- | src/declarative/debugger/qdeclarativedebugtrace.cpp | 4 | ||||
-rw-r--r-- | src/declarative/qml/v4/qv4irbuilder.cpp | 4 | ||||
-rw-r--r-- | src/imports/testlib/main.cpp | 4 | ||||
-rw-r--r-- | tools/qmlviewer/main.cpp | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/declarative/debugger/qdeclarativedebugtrace.cpp b/src/declarative/debugger/qdeclarativedebugtrace.cpp index a9cdfac6b7..aed7866da2 100644 --- a/src/declarative/debugger/qdeclarativedebugtrace.cpp +++ b/src/declarative/debugger/qdeclarativedebugtrace.cpp @@ -91,13 +91,13 @@ QDeclarativeDebugTrace::~QDeclarativeDebugTrace() { } -void QDeclarativeDebugTrace::addEngine(QDeclarativeEngine * /*engine*/) +void QDeclarativeDebugTrace::addEngine(QDeclarativeEngine *) { // just make sure that the service is properly registered traceInstance(); } -void QDeclarativeDebugTrace::removeEngine(QDeclarativeEngine */*engine*/) +void QDeclarativeDebugTrace::removeEngine(QDeclarativeEngine *) { } diff --git a/src/declarative/qml/v4/qv4irbuilder.cpp b/src/declarative/qml/v4/qv4irbuilder.cpp index eefaf67474..258627a079 100644 --- a/src/declarative/qml/v4/qv4irbuilder.cpp +++ b/src/declarative/qml/v4/qv4irbuilder.cpp @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE using namespace QDeclarativeJS; -static IR::Type irTypeFromVariantType(int t, QDeclarativeEnginePrivate *engine, const QMetaObject *meta) +static IR::Type irTypeFromVariantType(int t, QDeclarativeEnginePrivate *engine, const QMetaObject * /* meta */) { switch (t) { case QMetaType::Bool: @@ -74,7 +74,7 @@ static IR::Type irTypeFromVariantType(int t, QDeclarativeEnginePrivate *engine, return IR::AnchorLineType; else if (t == qMetaTypeId<QQuickAnchorLine>()) return IR::SGAnchorLineType; - else if (const QMetaObject *m = engine->metaObjectForType(t)) { + else if (engine->metaObjectForType(t)) { return IR::ObjectType; } diff --git a/src/imports/testlib/main.cpp b/src/imports/testlib/main.cpp index daec00d38c..b393c3d44a 100644 --- a/src/imports/testlib/main.cpp +++ b/src/imports/testlib/main.cpp @@ -165,7 +165,7 @@ public: qmlRegisterType<QuickTestUtil>(uri,1,0,"TestUtil"); } - void initializeEngine(QDeclarativeEngine *engine, const char *) + void initializeEngine(QDeclarativeEngine *, const char *) { } }; @@ -174,4 +174,4 @@ QT_END_NAMESPACE #include "main.moc" -Q_EXPORT_PLUGIN2(qmltestplugin, QT_PREPEND_NAMESPACE(QTestQmlModule)); +Q_EXPORT_PLUGIN2(qmltestplugin, QT_PREPEND_NAMESPACE(QTestQmlModule)) diff --git a/tools/qmlviewer/main.cpp b/tools/qmlviewer/main.cpp index 91362bb241..2ab4689020 100644 --- a/tools/qmlviewer/main.cpp +++ b/tools/qmlviewer/main.cpp @@ -84,7 +84,7 @@ void myMessageOutput(QtMsgType type, const char *msg) if (!logger.isNull()) { if (recursiveLock.testAndSetOrdered(0, 1)) { QMetaObject::invokeMethod(logger.data(), "append", Q_ARG(QString, strMsg)); - recursiveLock = 0; + recursiveLock.store(0); } } else { warnings += strMsg; |