Merge remote branch 'origin/master' into qt-master-from-4.6

Conflicts:
	tests/auto/qlineedit/tst_qlineedit.cpp
	tests/benchmarks/benchmarks.pro

1 files changed, 127 insertions, 0 deletions

diff --git a/src/declarative/qml/qmlinfo.cpp b/src/declarative/qml/qmlinfo.cpp
new file mode 100644
index 0000000..dabf944
--- /dev/null
+++ b/src/declarative/qml/qmlinfo.cpp
@@ -0,0 +1,127 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qmlinfo.h"
+
+#include "qmldeclarativedata_p.h"
+#include "qmlcontext.h"
+#include "qmlmetatype.h"
+
+#include <QCoreApplication>
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \fn QmlInfo qmlInfo(const QObject *object)
+
+    \brief Prints warnings messages that include the file and line number for QML types.
+
+    When QML types display warning messages, it improves traceability
+    if they include the QML file and line number on which the
+    particular instance was instantiated.
+    
+    To include the file and line number, an object must be passed.  If
+    the file and line number is not available for that instance
+    (either it was not instantiated by the QML engine or location
+    information is disabled), "unknown location" will be used instead.
+
+    For example, 
+
+    \code
+    qmlInfo(object) << tr("component property is a write-once property");
+    \endcode
+
+    prints
+
+    \code
+    QML MyCustomType (unknown location): component property is a write-once property
+    \endcode
+*/
+
+QmlInfo::QmlInfo(const QObject *object)
+: QDebug(QtWarningMsg)
+{
+    QString pos = QLatin1String("QML");
+    if (object) {
+        pos += QLatin1Char(' ');
+
+        QString typeName;
+        QmlType *type = QmlMetaType::qmlType(object->metaObject());
+        if (type) {
+            typeName = QLatin1String(type->qmlTypeName());
+            int lastSlash = typeName.lastIndexOf(QLatin1Char('/'));
+            if (lastSlash != -1)
+                typeName = typeName.mid(lastSlash+1);
+        } else {
+            typeName = QString::fromUtf8(object->metaObject()->className());
+            int marker = typeName.indexOf(QLatin1String("_QMLTYPE_"));
+            if (marker != -1)
+                typeName = typeName.left(marker);
+        }
+
+        pos += typeName;
+    }
+    QmlDeclarativeData *ddata = object?QmlDeclarativeData::get(object):0;
+    pos += QLatin1String(" (");
+    if (ddata) {
+        if (ddata->outerContext) {
+            pos += ddata->outerContext->baseUrl().toString();
+            pos += QLatin1Char(':');
+            pos += QString::number(ddata->lineNumber);
+            pos += QLatin1Char(':');
+            pos += QString::number(ddata->columnNumber);
+        } else {
+            pos += QCoreApplication::translate("QmlInfo","unknown location");
+        }
+    } else {
+        pos += QCoreApplication::translate("QmlInfo","unknown location");
+    }
+    pos += QLatin1Char(')');
+    *this << pos;
+    nospace();
+}
+
+QmlInfo::~QmlInfo()
+{
+}
+
+
+QT_END_NAMESPACE