Merge remote branch 'qt/master' into file-engine-refactor

Conflicts:
	demos/declarative/minehunt/minehunt.pro
	src/corelib/io/io.pri
	src/corelib/io/qfsfileengine.cpp
	src/corelib/io/qfsfileengine_unix.cpp
	src/corelib/io/qfsfileengine_win.cpp
	src/s60installs/bwins/QtCoreu.def
	src/s60installs/bwins/QtDeclarativeu.def
	src/s60installs/bwins/QtGuiu.def
	src/s60installs/eabi/QtCoreu.def
	src/s60installs/eabi/QtDeclarativeu.def
	src/s60installs/eabi/QtGuiu.def
	tests/auto/qapplication/test/test.pro
	tests/auto/qaudioinput/qaudioinput.pro
	tests/auto/qaudiooutput/qaudiooutput.pro
	tests/auto/qchar/qchar.pro
	tests/auto/qdiriterator/qdiriterator.pro
	tests/auto/qsound/qsound.pro

12 files changed, 76 insertions, 13 deletions

diff --git a/tests/benchmarks/declarative/binding/binding.pro b/tests/benchmarks/declarative/binding/binding.pro
index b93977a..bbe8701 100644
--- a/tests/benchmarks/declarative/binding/binding.pro
+++ b/tests/benchmarks/declarative/binding/binding.pro
@@ -8,7 +8,7 @@ SOURCES += tst_binding.cpp testtypes.cpp
 HEADERS += testtypes.h
 
 symbian {
-    data.sources = data
+    data.files = data
     data.path = .
     DEPLOYMENT += data
 } else {
diff --git a/tests/benchmarks/declarative/compilation/compilation.pro b/tests/benchmarks/declarative/compilation/compilation.pro
index 9277187..9ab2a25 100644
--- a/tests/benchmarks/declarative/compilation/compilation.pro
+++ b/tests/benchmarks/declarative/compilation/compilation.pro
@@ -9,7 +9,7 @@ CONFIG += release
 SOURCES += tst_compilation.cpp
 
 symbian {
-  data.sources += data
+  data.files += data
   data.path = .
   DEPLOYMENT += data
 } else {
diff --git a/tests/benchmarks/declarative/creation/creation.pro b/tests/benchmarks/declarative/creation/creation.pro
index 6540fa2..74cb47f 100644
--- a/tests/benchmarks/declarative/creation/creation.pro
+++ b/tests/benchmarks/declarative/creation/creation.pro
@@ -7,7 +7,7 @@ macx:CONFIG -= app_bundle
 SOURCES += tst_creation.cpp
 
 symbian {
-    data.sources = data
+    data.files = data
     data.path = .
     DEPLOYMENT += data
 } else {
diff --git a/tests/benchmarks/declarative/creation/tst_creation.cpp b/tests/benchmarks/declarative/creation/tst_creation.cpp
index 6bf7943..7026c40 100644
--- a/tests/benchmarks/declarative/creation/tst_creation.cpp
+++ b/tests/benchmarks/declarative/creation/tst_creation.cpp
@@ -243,7 +243,7 @@ void tst_creation::qobject_alloc()
     }
 }
 
-struct QDeclarativeGraphics_DerivedObject : public QObject
+struct QDeclarativeGraphics_Derived : public QObject
 {
     void setParent_noEvent(QObject *parent) {
         bool sce = d_ptr->sendChildEvents;
@@ -255,7 +255,7 @@ struct QDeclarativeGraphics_DerivedObject : public QObject
 
 inline void QDeclarativeGraphics_setParent_noEvent(QObject *object, QObject *parent)
 {
-    static_cast<QDeclarativeGraphics_DerivedObject *>(object)->setParent_noEvent(parent);
+    static_cast<QDeclarativeGraphics_Derived *>(object)->setParent_noEvent(parent);
 }
 
 void tst_creation::itemtree_notree_cpp()
diff --git a/tests/benchmarks/declarative/declarative.pro b/tests/benchmarks/declarative/declarative.pro
index 5dd31f3..cb02a35 100644
--- a/tests/benchmarks/declarative/declarative.pro
+++ b/tests/benchmarks/declarative/declarative.pro
@@ -12,4 +12,4 @@ SUBDIRS += \
 
 contains(QT_CONFIG, opengl): SUBDIRS += painting
 
-
+include(../trusted-benchmarks.pri)
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/qdeclarativecomponent.pro b/tests/benchmarks/declarative/qdeclarativecomponent/qdeclarativecomponent.pro
index b2f39c1..4693a82 100644
--- a/tests/benchmarks/declarative/qdeclarativecomponent/qdeclarativecomponent.pro
+++ b/tests/benchmarks/declarative/qdeclarativecomponent/qdeclarativecomponent.pro
@@ -8,7 +8,7 @@ SOURCES += tst_qdeclarativecomponent.cpp testtypes.cpp
 HEADERS += testtypes.h
 
 symbian {
-    data.sources = data
+    data.files = data
     data.path = .
     DEPLOYMENT += data
 } else {
diff --git a/tests/benchmarks/declarative/qdeclarativeimage/qdeclarativeimage.pro b/tests/benchmarks/declarative/qdeclarativeimage/qdeclarativeimage.pro
index 313282b..0d7c184 100644
--- a/tests/benchmarks/declarative/qdeclarativeimage/qdeclarativeimage.pro
+++ b/tests/benchmarks/declarative/qdeclarativeimage/qdeclarativeimage.pro
@@ -8,7 +8,7 @@ CONFIG += release
 SOURCES += tst_qdeclarativeimage.cpp
 
 symbian {
-    importFiles.sources = image.png
+    importFiles.files = image.png
     importFiles.path = 
     DEPLOYMENT += importFiles
 } else {
diff --git a/tests/benchmarks/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro b/tests/benchmarks/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro
index 65ee7e0..765e37a 100644
--- a/tests/benchmarks/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro
+++ b/tests/benchmarks/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro
@@ -7,7 +7,7 @@ macx:CONFIG -= app_bundle
 SOURCES += tst_qdeclarativemetaproperty.cpp 
 
 symbian {
-  data.sources += data
+  data.files += data
   data.path = .
   DEPLOYMENT += data
 } else {
diff --git a/tests/benchmarks/declarative/qmltime/qmltime.cpp b/tests/benchmarks/declarative/qmltime/qmltime.cpp
index e1b73ca..f0a24f6 100644
--- a/tests/benchmarks/declarative/qmltime/qmltime.cpp
+++ b/tests/benchmarks/declarative/qmltime/qmltime.cpp
@@ -148,7 +148,68 @@ void Timer::runTest(QDeclarativeContext *context, uint iterations)
 
 void usage(const char *name)
 {
-    qWarning("Usage: %s [-iterations <count>] [-parent] <qml file>", name);
+    qWarning("Usage: %s [-iterations <count>] [-parent] <qml file>\n", name);
+
+    qWarning("qmltime is a tool for benchmarking the runtime cost of instantiating\n"
+    "a QML component. It is typically run as follows:\n"
+    "\n"
+    "%s path/to/benchmark.qml\n"
+    "\n"
+    "If the -parent option is specified, the component being measured will also\n"
+    "be parented to an item already in the scene.\n"
+    "\n"
+    "If the -iterations option is specified, the benchmark will run the specified\n"
+    "number of iterations. If -iterations is not specified, 1024 iterations\n"
+    "are performed.\n"
+    "\n"
+    "qmltime expects the file to be benchmarked to contain a certain structure.\n"
+    "Specifically, it requires the presence of a QmlTime.Timer element. For example,\n"
+    "say we wanted to benchmark the following list delegate:\n"
+    "\n"
+    "Rectangle {\n"
+    "    color: \"green\"\n"
+    "    width: 400; height: 100\n"
+    "    Text {\n"
+    "        anchors.centerIn: parent\n"
+    "        text: name\n"
+    "    }\n"
+    "}\n"
+    "\n"
+    "we would create a benchmark file that looks like this:\n"
+    "\n"
+    "import QtQuick 1.0\n"
+    "import QmlTime 1.0 as QmlTime\n"
+    "\n"
+    "Item {\n"
+    "\n"
+    "    property string name: \"Bob Smith\"\n"
+    "\n"
+    "    QmlTime.Timer {\n"
+    "        component: Rectangle {\n"
+    "            color: \"green\"\n"
+    "            width: 400; height: 100\n"
+    "            Text {\n"
+    "                anchors.centerIn: parent\n"
+    "                text: name\n"
+    "            }\n"
+    "        }\n"
+    "    }\n"
+    "}\n"
+    "\n"
+    "The outer Item functions as a dummy data provider for any additional\n"
+    "data required by the bindings in the component being benchmarked (in the\n"
+    "example above we provide a \"name\" property).\n"
+    "\n"
+    "When started, the component is instantiated once before running\n"
+    "the benchmark, which means that the reported time does not include\n"
+    "compile time (as the results of compilation are cached internally).\n"
+    "In this sense the times reported by qmltime best correspond to the\n"
+    "costs associated with delegate creation in the view classes, where the\n"
+    "same delegate is instantiated over and over. Conversely, it is not a\n"
+    "good approximation for e.g. Loader, which typically only instantiates\n"
+    "an element once (and so for Loader the compile time is very relevant\n"
+    "to the overall cost).", name);
+
     exit(-1);
 }
 
@@ -178,6 +239,8 @@ int main(int argc, char ** argv)
             }
         } else if (arg == "-parent") {
             willParent = true;
+        } else if (arg == "-help") {
+            usage(argv[0]);
         } else {
             filename = QLatin1String(argv[ii]);
         }
diff --git a/tests/benchmarks/declarative/qmltime/qmltime.pro b/tests/benchmarks/declarative/qmltime/qmltime.pro
index 6f5ad5e..273a60a 100644
--- a/tests/benchmarks/declarative/qmltime/qmltime.pro
+++ b/tests/benchmarks/declarative/qmltime/qmltime.pro
@@ -8,7 +8,7 @@ SOURCES += qmltime.cpp
 
 symbian {
     TARGET.CAPABILITY = "All -TCB"
-    example.sources = example.qml tests
+    example.files = example.qml tests
     example.path = .
     DEPLOYMENT += example
 }
diff --git a/tests/benchmarks/declarative/script/script.pro b/tests/benchmarks/declarative/script/script.pro
index 759c6dd..75faa5c 100644
--- a/tests/benchmarks/declarative/script/script.pro
+++ b/tests/benchmarks/declarative/script/script.pro
@@ -8,7 +8,7 @@ CONFIG += release
 SOURCES += tst_script.cpp
 
 symbian {
-    importFiles.sources = data
+    importFiles.files = data
     importFiles.path =
     DEPLOYMENT += importFiles
 } else {
diff --git a/tests/benchmarks/declarative/typeimports/typeimports.pro b/tests/benchmarks/declarative/typeimports/typeimports.pro
index a5df3f0..56834e6 100644
--- a/tests/benchmarks/declarative/typeimports/typeimports.pro
+++ b/tests/benchmarks/declarative/typeimports/typeimports.pro
@@ -7,7 +7,7 @@ macx:CONFIG -= app_bundle
 SOURCES += tst_typeimports.cpp
 
 symbian {
-    data.sources = data
+    data.files = data
     data.path = .
     DEPLOYMENT += data
 } else {