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, 19 insertions, 1 deletions

diff --git a/tests/auto/qsharedpointer/externaltests.cpp b/tests/auto/qsharedpointer/externaltests.cpp
index 18df37c..92682a5 100644
--- a/tests/auto/qsharedpointer/externaltests.cpp
+++ b/tests/auto/qsharedpointer/externaltests.cpp
@@ -63,7 +63,7 @@ static QString makespec()
 {
     static const char default_makespec[] = DEFAULT_MAKESPEC;
     const char *p;
-    for (p = default_makespec + sizeof(default_makespec); p >= default_makespec; --p)
+    for (p = default_makespec + sizeof(default_makespec) - 1; p >= default_makespec; --p)
         if (*p == '/' || *p == '\\')
             break;
 
@@ -126,6 +126,7 @@ namespace QTest {
         enum Target { Compile, Link, Run };
 
         QList<QByteArray> qmakeLines;
+        QStringList extraProgramSources;
         QByteArray programHeader;
         QExternalTest::QtModules qtModules;
         QExternalTest::ApplicationType appType;
@@ -203,6 +204,16 @@ namespace QTest {
         d->appType = type;
     }
 
+    QStringList QExternalTest::extraProgramSources() const
+    {
+        return d->extraProgramSources;
+    }
+
+    void QExternalTest::setExtraProgramSources(const QStringList &extra)
+    {
+        d->extraProgramSources = extra;
+    }
+
     QByteArray QExternalTest::programHeader() const
     {
         return d->programHeader;
@@ -487,6 +498,13 @@ namespace QTest {
         else
             projectFile.write("\nCONFIG  += release\n");
 
+        QByteArray extraSources = QFile::encodeName(extraProgramSources.join(" "));
+        if (!extraSources.isEmpty()) {
+            projectFile.write("SOURCES  += ");
+            projectFile.write(extraSources);
+            projectFile.putChar('\n');
+        }
+
         // Add Qt modules
         if (qtModules & QExternalTest::QtCore)
             projectFile.write("QT += core\n");