13 files changed, 640 insertions, 0 deletions
diff --git a/tests/auto/qpluginloader/.gitignore b/tests/auto/qpluginloader/.gitignore
new file mode 100644
index 0000000..6b2fa3a
--- /dev/null
+++ b/tests/auto/qpluginloader/.gitignore
@@ -0,0 +1,2 @@
+tst_qpluginloader
+bin/
diff --git a/tests/auto/qpluginloader/almostplugin/almostplugin.cpp b/tests/auto/qpluginloader/almostplugin/almostplugin.cpp
new file mode 100644
index 0000000..e0cc5da
--- /dev/null
+++ b/tests/auto/qpluginloader/almostplugin/almostplugin.cpp
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QtCore/QString>
+#include "almostplugin.h"
+#include <QtCore/qplugin.h>
+
+QString AlmostPlugin::pluginName() const
+{
+    unresolvedSymbol();
+    return QLatin1String("Plugin ok");
+}
+
+Q_EXPORT_PLUGIN2(almostplugin, AlmostPlugin)
diff --git a/tests/auto/qpluginloader/almostplugin/almostplugin.h b/tests/auto/qpluginloader/almostplugin/almostplugin.h
new file mode 100644
index 0000000..f77acb1
--- /dev/null
+++ b/tests/auto/qpluginloader/almostplugin/almostplugin.h
@@ -0,0 +1,57 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#ifndef ALMOSTPLUGIN_H
+#define ALMOSTPLUGIN_H
+
+#include <QObject>
+#include "../theplugin/plugininterface.h"
+
+class AlmostPlugin : public QObject, public PluginInterface
+{
+    Q_OBJECT
+    Q_INTERFACES(PluginInterface)
+
+public:
+    QString pluginName() const;
+    void unresolvedSymbol() const;
+};
+
+#endif // ALMOSTPLUGIN_H
diff --git a/tests/auto/qpluginloader/almostplugin/almostplugin.pro b/tests/auto/qpluginloader/almostplugin/almostplugin.pro
new file mode 100644
index 0000000..b45509e
--- /dev/null
+++ b/tests/auto/qpluginloader/almostplugin/almostplugin.pro
@@ -0,0 +1,7 @@
+TEMPLATE      = lib
+CONFIG       += plugin
+HEADERS       = almostplugin.h
+SOURCES       = almostplugin.cpp
+TARGET        = almostplugin
+DESTDIR       = ../bin
+*-g++*:QMAKE_LFLAGS -= -Wl,--no-undefined
diff --git a/tests/auto/qpluginloader/lib/lib.pro b/tests/auto/qpluginloader/lib/lib.pro
new file mode 100644
index 0000000..7e842f2
--- /dev/null
+++ b/tests/auto/qpluginloader/lib/lib.pro
@@ -0,0 +1,15 @@
+TEMPLATE = lib
+CONFIG += dll
+CONFIG -= staticlib
+SOURCES		= mylib.c
+TARGET = mylib
+DESTDIR = ../bin
+QT = core
+
+win32-msvc: DEFINES += WIN32_MSVC
+win32-borland: DEFINES += WIN32_BORLAND
+
+#no special install rule for the library used by test
+INSTALLS =
+
+
diff --git a/tests/auto/qpluginloader/lib/mylib.c b/tests/auto/qpluginloader/lib/mylib.c
new file mode 100644
index 0000000..1366b7c
--- /dev/null
+++ b/tests/auto/qpluginloader/lib/mylib.c
@@ -0,0 +1,19 @@
+#include <qglobal.h>
+
+#if defined(Q_CC_MSVC) || defined(Q_CC_MSVC_NET) || defined(Q_CC_BOR)
+#define LIB_EXPORT __declspec(dllexport)
+#else
+#define LIB_EXPORT
+#endif
+
+#if defined(Q_CC_BOR)
+# define BORLAND_STDCALL __stdcall
+#else
+# define BORLAND_STDCALL
+#endif
+
+LIB_EXPORT int BORLAND_STDCALL version()
+{
+    return 1;
+}
+
diff --git a/tests/auto/qpluginloader/qpluginloader.pro b/tests/auto/qpluginloader/qpluginloader.pro
new file mode 100644
index 0000000..50c17ed
--- /dev/null
+++ b/tests/auto/qpluginloader/qpluginloader.pro
@@ -0,0 +1,12 @@
+TEMPLATE    =	subdirs
+CONFIG  += ordered
+SUBDIRS	=	lib \
+                theplugin \
+		tst
+!win32: !macx-*: SUBDIRS += almostplugin
+TARGET = tst_qpluginloader
+
+# no special install rule for subdir
+INSTALLS =
+
+
diff --git a/tests/auto/qpluginloader/theplugin/plugininterface.h b/tests/auto/qpluginloader/theplugin/plugininterface.h
new file mode 100644
index 0000000..da0d986
--- /dev/null
+++ b/tests/auto/qpluginloader/theplugin/plugininterface.h
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#ifndef PLUGININTERFACE_H
+#define PLUGININTERFACE_H
+
+struct PluginInterface {
+    virtual ~PluginInterface() {}
+    virtual QString pluginName() const = 0;
+};
+Q_DECLARE_INTERFACE(PluginInterface, "com.trolltect.autotests.plugininterface/1.0")
+
+#endif // PLUGININTERFACE_H
+
diff --git a/tests/auto/qpluginloader/theplugin/theplugin.cpp b/tests/auto/qpluginloader/theplugin/theplugin.cpp
new file mode 100644
index 0000000..6b9f856
--- /dev/null
+++ b/tests/auto/qpluginloader/theplugin/theplugin.cpp
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QtCore/QString>
+#include "theplugin.h"
+#include <QtCore/qplugin.h>
+
+QString ThePlugin::pluginName() const
+{
+    return QLatin1String("Plugin ok");
+}
+
+Q_EXPORT_PLUGIN2(theplugin, ThePlugin)
+
diff --git a/tests/auto/qpluginloader/theplugin/theplugin.h b/tests/auto/qpluginloader/theplugin/theplugin.h
new file mode 100644
index 0000000..f6efd6b
--- /dev/null
+++ b/tests/auto/qpluginloader/theplugin/theplugin.h
@@ -0,0 +1,57 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#ifndef THEPLUGIN_H
+#define THEPLUGIN_H
+
+#include <QObject>
+#include "plugininterface.h"
+
+class ThePlugin : public QObject, public PluginInterface
+{
+    Q_OBJECT
+    Q_INTERFACES(PluginInterface)
+
+public:
+    virtual QString pluginName() const;
+};
+
+#endif // THEPLUGIN_H
+
diff --git a/tests/auto/qpluginloader/theplugin/theplugin.pro b/tests/auto/qpluginloader/theplugin/theplugin.pro
new file mode 100644
index 0000000..d8d87b0
--- /dev/null
+++ b/tests/auto/qpluginloader/theplugin/theplugin.pro
@@ -0,0 +1,7 @@
+TEMPLATE      = lib
+CONFIG       += plugin
+HEADERS       = theplugin.h
+SOURCES       = theplugin.cpp
+TARGET        = $$qtLibraryTarget(theplugin)
+DESTDIR       = ../bin
+
diff --git a/tests/auto/qpluginloader/tst/tst.pro b/tests/auto/qpluginloader/tst/tst.pro
new file mode 100644
index 0000000..5331f09
--- /dev/null
+++ b/tests/auto/qpluginloader/tst/tst.pro
@@ -0,0 +1,20 @@
+load(qttest_p4)
+SOURCES         += ../tst_qpluginloader.cpp
+TARGET  = ../tst_qpluginloader
+QT = core
+
+win32 {
+  CONFIG(debug, debug|release) {
+    TARGET = ../../debug/tst_qpluginloader
+} else {
+    TARGET = ../../release/tst_qpluginloader
+  }
+}
+
+
+wince*: {
+   addFiles.sources = ../bin/*.dll
+   addFiles.path = bin
+   DEPLOYMENT += addFiles
+}
+
diff --git a/tests/auto/qpluginloader/tst_qpluginloader.cpp b/tests/auto/qpluginloader/tst_qpluginloader.cpp
new file mode 100644
index 0000000..a003f5c
--- /dev/null
+++ b/tests/auto/qpluginloader/tst_qpluginloader.cpp
@@ -0,0 +1,291 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#include <QtTest/QtTest>
+#include <qdir.h>
+#include <qpluginloader.h>
+#include "theplugin/plugininterface.h"
+
+// Helper macros to let us know if some suffixes are valid
+#define bundle_VALID    false
+#define dylib_VALID     false
+#define sl_VALID        false
+#define a_VALID         false
+#define so_VALID        false
+#define dll_VALID       false
+
+#if defined(Q_OS_DARWIN)
+# undef bundle_VALID
+# undef dylib_VALID
+# undef so_VALID
+# define bundle_VALID   true
+# define dylib_VALID    true
+# define so_VALID       true
+# define SUFFIX         ".dylib"
+# define PREFIX         "lib"
+
+#elif defined(Q_OS_HPUX) && !defined(__ia64)
+# undef sl_VALID
+# define sl_VALID       true
+# define SUFFIX         ".sl"
+# define PREFIX         "lib"
+
+#elif defined(Q_OS_AIX)
+# undef a_VALID
+# undef so_VALID
+# define a_VALID        true
+# define so_VALID       true
+# define SUFFIX         ".so"
+# define PREFIX         "lib"
+
+#elif defined(Q_OS_WIN)
+# undef dll_VALID
+# define dll_VALID      true
+# ifdef QT_NO_DEBUG
+#  define SUFFIX         ".dll"
+# else
+#  define SUFFIX         "d.dll"
+# endif
+# define PREFIX         ""
+
+#else  // all other Unix
+# undef so_VALID
+# define so_VALID       true
+# define SUFFIX         ".so"
+# define PREFIX         "lib"
+#endif
+
+static QString sys_qualifiedLibraryName(const QString &fileName)
+{
+    QString currDir = QDir::currentPath();
+    return currDir + "/bin/" + PREFIX + fileName + SUFFIX;
+}
+
+//TESTED_CLASS=
+//TESTED_FILES=
+
+QT_FORWARD_DECLARE_CLASS(QPluginLoader)
+class tst_QPluginLoader : public QObject
+{
+    Q_OBJECT
+
+public:
+    tst_QPluginLoader();
+    virtual ~tst_QPluginLoader();
+
+private slots:
+    void errorString();
+    void loadHints();
+    void deleteinstanceOnUnload();
+
+};
+
+tst_QPluginLoader::tst_QPluginLoader()
+
+{
+}
+
+tst_QPluginLoader::~tst_QPluginLoader()
+{
+}
+
+//#define SHOW_ERRORS 1
+
+void tst_QPluginLoader::errorString()
+{
+#if defined(Q_OS_WINCE)
+    // On WinCE we need an QCoreApplication object for current dir
+    int argc = 0;
+    QCoreApplication app(argc,0);
+#endif
+    const QString unknown(QLatin1String("Unknown error"));
+
+    {
+    QPluginLoader loader; // default constructed
+    bool loaded = loader.load();
+#ifdef SHOW_ERRORS
+    qDebug() << loader.errorString();
+#endif
+    QCOMPARE(loaded, false);
+    QCOMPARE(loader.errorString(), unknown);
+
+    QObject *obj = loader.instance();
+#ifdef SHOW_ERRORS
+    qDebug() << loader.errorString();
+#endif
+    QCOMPARE(obj, static_cast<QObject*>(0));
+    QCOMPARE(loader.errorString(), unknown);
+
+    bool unloaded = loader.unload();
+#ifdef SHOW_ERRORS
+    qDebug() << loader.errorString();
+#endif
+    QCOMPARE(unloaded, false);
+    QCOMPARE(loader.errorString(), unknown);
+    }
+    {
+    QPluginLoader loader( sys_qualifiedLibraryName("mylib"));     //not a plugin
+    bool loaded = loader.load();
+#ifdef SHOW_ERRORS
+    qDebug() << loader.errorString();
+#endif
+    QCOMPARE(loaded, false);
+    QVERIFY(loader.errorString() != unknown);
+
+    QObject *obj = loader.instance();
+#ifdef SHOW_ERRORS
+    qDebug() << loader.errorString();
+#endif
+    QCOMPARE(obj, static_cast<QObject*>(0));
+    QVERIFY(loader.errorString() != unknown);
+
+    bool unloaded = loader.unload();
+#ifdef SHOW_ERRORS
+    qDebug() << loader.errorString();
+#endif
+    QCOMPARE(unloaded, false);
+    QVERIFY(loader.errorString() != unknown);
+    }
+
+    {
+    QPluginLoader loader( sys_qualifiedLibraryName("nosuchfile"));     //not a file
+    bool loaded = loader.load();
+#ifdef SHOW_ERRORS
+    qDebug() << loader.errorString();
+#endif
+    QCOMPARE(loaded, false);
+    QVERIFY(loader.errorString() != unknown);
+
+    QObject *obj = loader.instance();
+#ifdef SHOW_ERRORS
+    qDebug() << loader.errorString();
+#endif
+    QCOMPARE(obj, static_cast<QObject*>(0));
+    QVERIFY(loader.errorString() != unknown);
+
+    bool unloaded = loader.unload();
+#ifdef SHOW_ERRORS
+    qDebug() << loader.errorString();
+#endif
+    QCOMPARE(unloaded, false);
+    QVERIFY(loader.errorString() != unknown);
+    }
+
+#if !defined Q_OS_WIN && !defined Q_OS_MAC && !defined Q_OS_HPUX
+    {
+    QPluginLoader loader( sys_qualifiedLibraryName("almostplugin"));     //a plugin with unresolved symbols
+    loader.setLoadHints(QLibrary::ResolveAllSymbolsHint);
+    QCOMPARE(loader.load(), false);
+#ifdef SHOW_ERRORS
+    qDebug() << loader.errorString();
+#endif
+    QVERIFY(loader.errorString() != unknown);
+
+    QCOMPARE(loader.instance(), static_cast<QObject*>(0));
+#ifdef SHOW_ERRORS
+    qDebug() << loader.errorString();
+#endif
+    QVERIFY(loader.errorString() != unknown);
+
+    QCOMPARE(loader.unload(), false);
+#ifdef SHOW_ERRORS
+    qDebug() << loader.errorString();
+#endif
+    QVERIFY(loader.errorString() != unknown);
+    }
+#endif
+
+    {
+    QPluginLoader loader( sys_qualifiedLibraryName("theplugin"));     //a plugin
+    QCOMPARE(loader.load(), true);
+    QCOMPARE(loader.errorString(), unknown);
+
+    QVERIFY(loader.instance() !=  static_cast<QObject*>(0));
+    QCOMPARE(loader.errorString(), unknown);
+
+    QCOMPARE(loader.unload(), true);
+    QCOMPARE(loader.errorString(), unknown);
+    }
+}
+
+void tst_QPluginLoader::loadHints()
+{
+    QPluginLoader loader;
+    QCOMPARE(loader.loadHints(), (QLibrary::LoadHints)0);   //Do not crash
+    loader.setLoadHints(QLibrary::ResolveAllSymbolsHint);
+    loader.setFileName( sys_qualifiedLibraryName("theplugin"));     //a plugin
+    QCOMPARE(loader.loadHints(), QLibrary::ResolveAllSymbolsHint);
+}
+
+void tst_QPluginLoader::deleteinstanceOnUnload()
+{
+    for (int pass = 0; pass < 2; ++pass) {
+        QPluginLoader loader1;
+        loader1.setFileName( sys_qualifiedLibraryName("theplugin"));     //a plugin
+        if (pass == 0)
+            loader1.load(); // not recommended, instance() should do the job.
+        PluginInterface *instance1 = qobject_cast<PluginInterface*>(loader1.instance());
+        QCOMPARE(instance1->pluginName(), QLatin1String("Plugin ok"));
+
+        QPluginLoader loader2;
+        loader2.setFileName( sys_qualifiedLibraryName("theplugin"));     //a plugin
+        if (pass == 0)
+            loader2.load(); // not recommended, instance() should do the job.
+        PluginInterface *instance2 = qobject_cast<PluginInterface*>(loader2.instance());
+        QCOMPARE(instance2->pluginName(), QLatin1String("Plugin ok"));
+
+        QSignalSpy spy1(loader1.instance(), SIGNAL(destroyed()));
+        QSignalSpy spy2(loader2.instance(), SIGNAL(destroyed()));
+        QCOMPARE(loader1.unload(), false);  // refcount not reached 0, not really unloaded
+        QCOMPARE(spy1.count(), 0);
+        QCOMPARE(spy2.count(), 0);
+        QCOMPARE(instance1->pluginName(), QLatin1String("Plugin ok"));
+        QCOMPARE(instance2->pluginName(), QLatin1String("Plugin ok"));
+        QCOMPARE(loader2.unload(), true);   // refcount reached 0, did really unload
+        QCOMPARE(spy1.count(), 1);
+        QCOMPARE(spy2.count(), 1);
+    }
+}
+
+QTEST_APPLESS_MAIN(tst_QPluginLoader)
+#include "tst_qpluginloader.moc"
+