Merge master -> api_changes

Includes fixes for tst_qfiledialog2, tst_qtextedit autotests on mac.

Change-Id: I49cac26894d31291a8339ccc1eb80b6a940f0827

4 files changed, 14 insertions, 14 deletions

diff --git a/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp b/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp
index 68ff8e4bb6..09fd0a7adb 100644
--- a/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp
+++ b/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp
@@ -326,6 +326,8 @@ public slots:
 signals:
     void sig0();
     QString sig1(QString s1);
+    void sig10(QString s1, QString s2, QString s3, QString s4, QString s5, QString s6, QString s7,
+               QString s8, QString s9, QString s10);
 
 protected:
     QtTestObject(QVariant) {}
@@ -725,6 +727,7 @@ typedef QString CustomString;
 class QtTestCustomObject: public QObject
 {
     Q_OBJECT
+    friend class tst_QMetaObject;
 public:
     QtTestCustomObject(): QObject(), sum(0) {}
 
@@ -1129,11 +1132,9 @@ void tst_QMetaObject::indexOfMethodPMF()
     }
 
     INDEXOFMETHODPMF_HELPER(tst_QMetaObject, value7Changed, (const QString&))
-    INDEXOFMETHODPMF_HELPER(tst_QMetaObject, stdSet, ())
-    INDEXOFMETHODPMF_HELPER(QtTestObject, sl10, (QString,QString,QString,QString,QString,QString,QString,QString,QString,QString))
     INDEXOFMETHODPMF_HELPER(QtTestObject, sig0, ())
-    INDEXOFMETHODPMF_HELPER(QtTestObject, testLongLong, (qint64, quint64))
-    INDEXOFMETHODPMF_HELPER(QtTestObject, testReference, (QString&))
+    INDEXOFMETHODPMF_HELPER(QtTestObject, sig10, (QString,QString,QString,QString,QString,QString,QString,QString,QString,QString))
+    INDEXOFMETHODPMF_HELPER(QtTestCustomObject, sig_custom, (const CustomString &))
 }
 
 QTEST_MAIN(tst_QMetaObject)
diff --git a/tests/auto/corelib/kernel/qobject/qobject.pro b/tests/auto/corelib/kernel/qobject/qobject.pro
index 0f86408fc9..6a7cf07f51 100644
--- a/tests/auto/corelib/kernel/qobject/qobject.pro
+++ b/tests/auto/corelib/kernel/qobject/qobject.pro
@@ -1,4 +1,6 @@
 TEMPLATE = subdirs
-SUBDIRS = signalbug
-tst_qobject.pro.depends = $$SUBDIRS
-SUBDIRS += tst_qobject.pro
+CONFIG += ordered
+
+SUBDIRS += \
+    signalbug \
+    test
diff --git a/tests/auto/corelib/kernel/qobject/signalbug/signalbug.pro b/tests/auto/corelib/kernel/qobject/signalbug/signalbug.pro
index 19d36a63a1..799ef34559 100644
--- a/tests/auto/corelib/kernel/qobject/signalbug/signalbug.pro
+++ b/tests/auto/corelib/kernel/qobject/signalbug/signalbug.pro
@@ -1,6 +1,3 @@
-TEMPLATE = app
-DEPENDPATH += .
-INCLUDEPATH += .
 CONFIG -= app_bundle debug_and_release
 CONFIG += console
 DESTDIR = ./
@@ -8,7 +5,7 @@ QT -= gui
 wince*: {
    LIBS += coredll.lib
 }
-# Input
+
 HEADERS += signalbug.h
 SOURCES += signalbug.cpp
 
diff --git a/tests/auto/corelib/kernel/qobject/tst_qobject.pro b/tests/auto/corelib/kernel/qobject/test/test.pro
index 30fd810a2e..9443b2e2c7 100644
--- a/tests/auto/corelib/kernel/qobject/tst_qobject.pro
+++ b/tests/auto/corelib/kernel/qobject/test/test.pro
@@ -1,11 +1,11 @@
 CONFIG += testcase console
-TARGET = tst_qobject
+TARGET = ../tst_qobject
 QT = core-private network testlib
-SOURCES = tst_qobject.cpp
+SOURCES = ../tst_qobject.cpp
 
 # this is here for a reason, moc_oldnormalizedobject.cpp is not auto-generated, it was generated by
 # moc from Qt 4.6, and should *not* be generated by the current moc
-SOURCES += moc_oldnormalizeobject.cpp
+SOURCES += ../moc_oldnormalizeobject.cpp
 
 load(testcase) # for target.path and installTestHelperApp()
 installTestHelperApp("signalbug/signalbug",signalbug,signalbug)