Merge commit 'qt/master-stable'

Conflicts:
	configure.exe
	qmake/Makefile.unix
	qmake/generators/makefile.cpp
	src/corelib/global/qglobal.h
	src/corelib/kernel/kernel.pri
	src/corelib/kernel/qcoreevent.cpp
	src/corelib/kernel/qsharedmemory_unix.cpp
	src/gui/graphicsview/qgraphicsscene.cpp
	src/gui/kernel/qaction.cpp
	src/gui/kernel/qaction.h
	src/gui/kernel/qaction_p.h
	src/gui/kernel/qapplication.cpp
	src/gui/kernel/qapplication.h
	src/gui/kernel/qwidget.cpp
	src/gui/kernel/qwidget.h
	src/gui/kernel/qwidget_mac.mm
	src/gui/painting/qgraphicssystemfactory.cpp
	src/gui/styles/qwindowsstyle.cpp
	src/gui/text/qfontengine_qpf.cpp
	src/gui/widgets/qabstractscrollarea_p.h
	src/network/access/qnetworkaccessdebugpipebackend.cpp
	src/network/socket/qlocalsocket_unix.cpp
	src/network/socket/qnativesocketengine_p.h
	src/network/socket/qnativesocketengine_unix.cpp
	src/openvg/qpaintengine_vg.cpp
	tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp
	tests/auto/qcssparser/qcssparser.pro
	tests/auto/qdir/tst_qdir.cpp
	tests/auto/qfile/tst_qfile.cpp
	tests/auto/qobject/tst_qobject.cpp
	tests/auto/qpathclipper/qpathclipper.pro
	tests/auto/qprocess/tst_qprocess.cpp
	tests/auto/qsettings/tst_qsettings.cpp
	tests/auto/qsharedpointer/qsharedpointer.pro
	tests/auto/qsqlquerymodel/qsqlquerymodel.pro
	tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
	tests/auto/qsqltablemodel/qsqltablemodel.pro
	tests/auto/qsqlthread/qsqlthread.pro
	tests/auto/qwidget/tst_qwidget.cpp

1 files changed, 23 insertions, 26 deletions

diff --git a/tests/auto/qfileinfo/tst_qfileinfo.cpp b/tests/auto/qfileinfo/tst_qfileinfo.cpp
index d94c7e4..ec58b6c 100644
--- a/tests/auto/qfileinfo/tst_qfileinfo.cpp
+++ b/tests/auto/qfileinfo/tst_qfileinfo.cpp
@@ -127,6 +127,8 @@ private slots:
     void size_data();
     void size();
 
+    void systemFiles();
+
     void compare_data();
     void compare();
 
@@ -359,8 +361,9 @@ void tst_QFileInfo::exists_data()
     QTest::newRow("data6") << "resources/*" << false;
     QTest::newRow("data7") << "resources/*.foo" << false;
     QTest::newRow("data8") << "resources/*.ext1" << false;
-    QTest::newRow("data9") << "." << true;
-    QTest::newRow("data10") << ". " << false;
+    QTest::newRow("data9") << "resources/file?.ext1" << false;
+    QTest::newRow("data10") << "." << true;
+    QTest::newRow("data11") << ". " << false;
 
     QTest::newRow("simple dir") << "resources" << true;
     QTest::newRow("simple dir with slash") << "resources/" << true;
@@ -750,6 +753,17 @@ void tst_QFileInfo::size()
     QTEST(int(fi.size()), "size");
 }
 
+void tst_QFileInfo::systemFiles()
+{
+#ifndef Q_OS_WIN
+    QSKIP("This is a Windows only test", SkipAll);
+#endif
+    QFileInfo fi("c:\\pagefile.sys");
+    QVERIFY(fi.exists());      // task 167099
+    QVERIFY(fi.size() > 0);    // task 189202
+    QVERIFY(fi.lastModified().isValid());
+}
+
 void tst_QFileInfo::compare_data()
 {
     QTest::addColumn<QString>("file1");
@@ -874,11 +888,6 @@ void tst_QFileInfo::fileTimes()
 #if !defined(Q_OS_UNIX) && !defined(Q_OS_WINCE)
     QVERIFY(fileInfo.created() < beforeWrite);
 #endif
-#ifdef Q_OS_WIN
-    if (QSysInfo::WindowsVersion & QSysInfo::WV_DOS_based) {
-        QVERIFY(fileInfo.lastRead().addDays(1) > beforeRead);
-    } else
-#endif
     //In Vista the last-access timestamp is not updated when the file is accessed/touched (by default).
     //To enable this the HKLM\SYSTEM\CurrentControlSet\Control\FileSystem\NtfsDisableLastAccessUpdate
     //is set to 0, in the test machine.
@@ -912,26 +921,14 @@ void tst_QFileInfo::fileTimes_oldFile()
     // WriteOnly can create files, ReadOnly cannot.
     DWORD creationDisp = OPEN_ALWAYS;
 
-    HANDLE fileHandle;
-
     // Create the file handle.
-    QT_WA({
-        fileHandle = CreateFileW(L"oldfile.txt",
-            accessRights,
-            shareMode,
-            &securityAtts,
-            creationDisp,
-            flagsAndAtts,
-            NULL);
-    }, {
-        fileHandle = CreateFileA("oldfile.txt",
-            accessRights,
-            shareMode,
-            &securityAtts,
-            creationDisp,
-            flagsAndAtts,
-            NULL);
-    });
+    HANDLE fileHandle = CreateFile(L"oldfile.txt",
+        accessRights,
+        shareMode,
+        &securityAtts,
+        creationDisp,
+        flagsAndAtts,
+        NULL);
 
     // Set file times back to 1601.
     FILETIME ctime;