From 47ca880f33a517201cf123470c9137202c625564 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sat, 6 Apr 2013 11:35:00 -0700 Subject: [PATCH] Fix new warnings in qtdeclarative (found by GCC 4.8) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit qqmlproperty.cpp:1561:35: warning: typedef ‘VMEMO’ locally defined but not used [-Wunused-local-typedefs] qquickglobal.cpp:1017:13: warning: ‘initialized’ defined but not used [-Wunused-variable] qquicktextnode.cpp:245:6: warning: unused parameter ‘position’ [-Wunused-parameter] Change-Id: I48c5486953278dc960249f68e0e122d108f56e07 Reviewed-by: Alan Alpert --- src/qml/qml/qqmlproperty.cpp | 1 - src/quick/items/qquicktextnode.cpp | 1 + src/quick/util/qquickglobal.cpp | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qml/qml/qqmlproperty.cpp b/src/qml/qml/qqmlproperty.cpp index f301b5a..fa728fe 100644 --- a/src/qml/qml/qqmlproperty.cpp +++ b/src/qml/qml/qqmlproperty.cpp @@ -1558,7 +1558,6 @@ bool QQmlPropertyPrivate::writeBinding(QObject *object, return false; } - typedef QQmlVMEMetaObject VMEMO; QQmlVMEMetaObject *vmemo = QQmlVMEMetaObject::get(object); Q_ASSERT(vmemo); vmemo->setVMEProperty(core.coreIndex, result); diff --git a/src/quick/items/qquicktextnode.cpp b/src/quick/items/qquicktextnode.cpp index d469594..4952a37 100644 --- a/src/quick/items/qquicktextnode.cpp +++ b/src/quick/items/qquicktextnode.cpp @@ -249,6 +249,7 @@ void QQuickTextNode::addTextLayout(const QPointF &position, QTextLayout *textLay int selectionStart, int selectionEnd, int lineStart, int lineCount) { + Q_UNUSED(position); initEngine(color, selectedTextColor, selectionColor, anchorColor); #ifndef QT_NO_IM diff --git a/src/quick/util/qquickglobal.cpp b/src/quick/util/qquickglobal.cpp index 4d17399..3ea1bc7 100644 --- a/src/quick/util/qquickglobal.cpp +++ b/src/quick/util/qquickglobal.cpp @@ -1014,6 +1014,6 @@ static bool initializeProviders() return true; } -static bool initialized = initializeProviders(); +Q_CONSTRUCTOR_FUNCTION(initializeProviders) QT_END_NAMESPACE -- 2.7.4