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

Conflicts:
	bin/syncqt
	demos/declarative/snake/content/snake.js
	demos/declarative/snake/snake.qml
	doc/src/development/qmake-manual.qdoc
	src/corelib/plugin/plugin.pri
	src/gui/kernel/qapplication_win.cpp
	src/gui/kernel/qdesktopwidget_win.cpp
	src/gui/painting/qdrawhelper.cpp
	tests/auto/qdir/tst_qdir.cpp
	tools/qdoc3/test/assistant.qdocconf
	tools/qdoc3/test/designer.qdocconf
	tools/qdoc3/test/linguist.qdocconf

1 files changed, 57 insertions, 8 deletions

diff --git a/tests/auto/qfileinfo/tst_qfileinfo.cpp b/tests/auto/qfileinfo/tst_qfileinfo.cpp
index a074f4b..7659a75 100644
--- a/tests/auto/qfileinfo/tst_qfileinfo.cpp
+++ b/tests/auto/qfileinfo/tst_qfileinfo.cpp
@@ -181,6 +181,8 @@ private slots:
     void equalOperator() const;
     void equalOperatorWithDifferentSlashes() const;
     void notEqualOperator() const;
+
+    void detachingOperations();
 };
 
 tst_QFileInfo::tst_QFileInfo()
@@ -247,13 +249,13 @@ void tst_QFileInfo::copy()
     QFileInfo info2(info);
     QFileInfoPrivate *privateInfo = getPrivate(info);
     QFileInfoPrivate *privateInfo2 = getPrivate(info2);
-    QCOMPARE(privateInfo->data, privateInfo2->data);
+    QCOMPARE(privateInfo, privateInfo2);
 
     //operator =
     QFileInfo info3 = info;
     QFileInfoPrivate *privateInfo3 = getPrivate(info3);
-    QCOMPARE(privateInfo->data, privateInfo3->data);
-    QCOMPARE(privateInfo2->data, privateInfo3->data);
+    QCOMPARE(privateInfo, privateInfo3);
+    QCOMPARE(privateInfo2, privateInfo3);
 
     //refreshing info3 will detach it
     QFile file(info.absoluteFilePath());
@@ -275,9 +277,10 @@ void tst_QFileInfo::copy()
     QTest::qWait(5000);
 #endif
     info3.refresh();
-    QVERIFY(privateInfo->data != privateInfo3->data);
-    QVERIFY(privateInfo2->data != privateInfo3->data);
-    QCOMPARE(privateInfo->data, privateInfo2->data);
+    privateInfo3 = getPrivate(info3);
+    QVERIFY(privateInfo != privateInfo3);
+    QVERIFY(privateInfo2 != privateInfo3);
+    QCOMPARE(privateInfo, privateInfo2);
 }
 
 void tst_QFileInfo::isFile_data()
@@ -1241,8 +1244,8 @@ void tst_QFileInfo::isLocalFs()
 
     QFileInfo info(path);
     QFileInfoPrivate *privateInfo = getPrivate(info);
-    QVERIFY(privateInfo->data->fileEngine);
-    QCOMPARE(bool(privateInfo->data->fileEngine->fileFlags(QAbstractFileEngine::LocalDiskFlag)
+    QVERIFY(privateInfo->fileEngine);
+    QCOMPARE(bool(privateInfo->fileEngine->fileFlags(QAbstractFileEngine::LocalDiskFlag)
                   & QAbstractFileEngine::LocalDiskFlag), isLocalFs);
 }
 
@@ -1544,5 +1547,51 @@ void tst_QFileInfo::notEqualOperator() const
     QVERIFY(QFileInfo() != QFileInfo());
 }
 
+void tst_QFileInfo::detachingOperations()
+{
+    QFileInfo info1;
+    QVERIFY(info1.caching());
+    info1.setCaching(false);
+
+    {
+        QFileInfo info2 = info1;
+
+        QVERIFY(!info1.caching());
+        QVERIFY(!info2.caching());
+
+        info2.setCaching(true);
+        QVERIFY(info2.caching());
+
+        info1.setFile("foo");
+        QVERIFY(!info1.caching());
+    }
+
+    {
+        QFile file("foo");
+        info1.setFile(file);
+        QVERIFY(!info1.caching());
+    }
+
+    info1.setFile(QDir(), "foo");
+    QVERIFY(!info1.caching());
+
+    {
+        QFileInfo info3;
+        QVERIFY(info3.caching());
+
+        info3 = info1;
+        QVERIFY(!info3.caching());
+    }
+
+    info1.refresh();
+    QVERIFY(!info1.caching());
+
+    QVERIFY(info1.makeAbsolute());
+    QVERIFY(!info1.caching());
+
+    info1.detach();
+    QVERIFY(!info1.caching());
+}
+
 QTEST_MAIN(tst_QFileInfo)
 #include "tst_qfileinfo.moc"