Merge master -> api_changes

Includes fixes for tst_qfiledialog2, tst_qtextedit autotests on mac.

Change-Id: I49cac26894d31291a8339ccc1eb80b6a940f0827

3 files changed, 29 insertions, 3 deletions

diff --git a/tests/auto/corelib/plugin/qplugin/debugplugin/main.cpp b/tests/auto/corelib/plugin/qplugin/debugplugin/main.cpp
index 057db69174..e27085c293 100644
--- a/tests/auto/corelib/plugin/qplugin/debugplugin/main.cpp
+++ b/tests/auto/corelib/plugin/qplugin/debugplugin/main.cpp
@@ -39,5 +39,14 @@
 **
 ****************************************************************************/
 #include <QtPlugin>
+#include <QObject>
 
-Q_EXPORT_PLUGIN2(DebugPlugin, QObject)
+class DebugPlugin : public QObject
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "SomeIID")
+public:
+    DebugPlugin() {}
+};
+
+#include "main.moc"
diff --git a/tests/auto/corelib/plugin/qplugin/releaseplugin/main.cpp b/tests/auto/corelib/plugin/qplugin/releaseplugin/main.cpp
index 9542695112..d0875d2902 100644
--- a/tests/auto/corelib/plugin/qplugin/releaseplugin/main.cpp
+++ b/tests/auto/corelib/plugin/qplugin/releaseplugin/main.cpp
@@ -39,5 +39,14 @@
 **
 ****************************************************************************/
 #include <QtPlugin>
+#include <QObject>
 
-Q_EXPORT_PLUGIN2(ReleasePlugin, QObject)
+class ReleasePlugin : public QObject
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "SomeIID")
+public:
+    ReleasePlugin() {}
+};
+
+#include "main.moc"
diff --git a/tests/auto/corelib/plugin/qplugin/tst_qplugin.cpp b/tests/auto/corelib/plugin/qplugin/tst_qplugin.cpp
index e6a83cf3d7..af76fcc4a2 100644
--- a/tests/auto/corelib/plugin/qplugin/tst_qplugin.cpp
+++ b/tests/auto/corelib/plugin/qplugin/tst_qplugin.cpp
@@ -55,15 +55,23 @@ public:
     tst_QPlugin();
 
 private slots:
+    void initTestCase();
     void loadDebugPlugin();
     void loadReleasePlugin();
 };
 
 tst_QPlugin::tst_QPlugin()
-    : dir("plugins")
+    : dir(QFINDTESTDATA("plugins"))
 {
 }
 
+void tst_QPlugin::initTestCase()
+{
+    QVERIFY2(dir.exists(),
+             qPrintable(QString::fromLatin1("Cannot find the 'plugins' directory starting from '%1'").
+                        arg(QDir::toNativeSeparators(QDir::currentPath()))));
+}
+
 void tst_QPlugin::loadDebugPlugin()
 {
     foreach (QString fileName, dir.entryList(QStringList() << "*debug*", QDir::Files)) {