diff options
| -rw-r--r-- | src/qml/qml/qqmlproperty.cpp | 1 | ||||
| -rw-r--r-- | src/quick/items/qquicktextnode.cpp | 1 | ||||
| -rw-r--r-- | 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 f301b5a6c7..fa728fec0d 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 d46959464a..4952a37082 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 4d17399222..3ea1bc73ad 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 |