Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  Check QML files for license headers too.
  Make compile: include script module for test
  Move copies of toLocalFileOrQrc() to QDeclarativeEnginePrivate
  Allow resource files to be loaded in WorkerScript
  Fix TextEdit alignment.
  Component::createObject() don't attempt to set parent of null object
  Factor out initialization effects from declarative benchmarks.
  Remove license headers from test data.
  Fix FolderListModel parentFolder property's file drive handling
  Add license headers for .qml files.
  Ensure QML Global Qt object functions appear in the documentation index
  doc
  Also show file/line numbers on XML query errors.
  Print warnings for xml query syntax errors
  Clean up
  Add XmlListModel::get()

1 files changed, 42 insertions, 0 deletions

diff --git a/tools/qml/content/Browser.qml b/tools/qml/content/Browser.qml
index 7238203..838a848 100644
--- a/tools/qml/content/Browser.qml
+++ b/tools/qml/content/Browser.qml
@@ -1,3 +1,44 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 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$
+**
+****************************************************************************/
+
 import Qt 4.7
 import Qt.labs.folderlistmodel 1.0
 
@@ -88,6 +129,7 @@ Rectangle {
                 anchors.leftMargin: 54
                 font.pixelSize: 32
                 color: (wrapper.ListView.isCurrentItem && root.keyPressed) ? palette.highlightedText : palette.windowText
+                elide: Text.ElideRight
             }
             MouseArea {
                 id: mouseRegion