Long live Qt 4.5!

9 files changed, 699 insertions, 0 deletions

diff --git a/tests/auto/qlibrary/.gitignore b/tests/auto/qlibrary/.gitignore
new file mode 100644
index 0000000..38963f2
--- /dev/null
+++ b/tests/auto/qlibrary/.gitignore
@@ -0,0 +1,10 @@
+tst_qlibrary
+mylib.dl2
+mylib.dll
+mylib.exp
+mylib.lib
+mylib2.dll
+mylib2.exp
+mylib2.lib
+mylib_noextension
+system.trolltech.test.mylib.dll
diff --git a/tests/auto/qlibrary/lib/lib.pro b/tests/auto/qlibrary/lib/lib.pro
new file mode 100644
index 0000000..14b8783
--- /dev/null
+++ b/tests/auto/qlibrary/lib/lib.pro
@@ -0,0 +1,30 @@
+TEMPLATE = lib
+CONFIG += dll
+CONFIG -= staticlib
+SOURCES		= mylib.c
+TARGET = mylib
+DESTDIR = ../
+QT = core
+
+wince*: DEFINES += WIN32_MSVC
+win32-msvc: DEFINES += WIN32_MSVC
+win32-borland: DEFINES += WIN32_BORLAND
+
+# Force a copy of the library to have an extension that is non-standard.
+# We want to test if we can load a shared library with *any* filename...
+
+# For windows test if we can load a filename with multiple dots.
+win32: {
+    QMAKE_POST_LINK = copy /Y $(DESTDIR_TARGET) ..\mylib.dl2 && \
+    copy /Y $(DESTDIR_TARGET) ..\system.trolltech.test.mylib.dll && \
+    copy /Y $(DESTDIR_TARGET) ..\mylib_noextension
+}
+unix: {
+    QMAKE_POST_LINK = cp -f $(DESTDIR)$(TARGET) ../libmylib.so2 && \
+    cp -f $(DESTDIR)$(TARGET) ../system.trolltech.test.mylib.so
+}
+
+#no special install rule for the library used by test
+INSTALLS =
+
+
diff --git a/tests/auto/qlibrary/lib/mylib.c b/tests/auto/qlibrary/lib/mylib.c
new file mode 100644
index 0000000..1366b7c
--- /dev/null
+++ b/tests/auto/qlibrary/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/qlibrary/lib2/lib2.pro b/tests/auto/qlibrary/lib2/lib2.pro
new file mode 100644
index 0000000..718c5c6
--- /dev/null
+++ b/tests/auto/qlibrary/lib2/lib2.pro
@@ -0,0 +1,30 @@
+TEMPLATE = lib
+CONFIG += dll
+CONFIG -= staticlib
+SOURCES		= mylib.c
+TARGET = mylib
+DESTDIR = ../
+VERSION = 2
+QT = core
+
+wince*: DEFINES += WIN32_MSVC
+win32-msvc: DEFINES += WIN32_MSVC
+win32-borland: DEFINES += WIN32_BORLAND
+
+# Force a copy of the library to have an extension that is non-standard.
+# We want to test if we can load a shared library with *any* filename...
+
+# For windows test if we can load a filename with multiple dots.
+win32: {
+    QMAKE_POST_LINK = copy /Y ..\mylib2.dll ..\mylib.dl2 && \
+    copy /Y ..\mylib2.dll ..\system.trolltech.test.mylib.dll
+}
+unix: {
+    QMAKE_POST_LINK = cp -f $(DESTDIR)$(TARGET) ../libmylib.so2 && \
+    cp -f $(DESTDIR)$(TARGET) ../system.trolltech.test.mylib.so
+}
+
+#no special install rule for the library used by test
+INSTALLS =
+
+
diff --git a/tests/auto/qlibrary/lib2/mylib.c b/tests/auto/qlibrary/lib2/mylib.c
new file mode 100644
index 0000000..dd90f04
--- /dev/null
+++ b/tests/auto/qlibrary/lib2/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 2;
+}
+
diff --git a/tests/auto/qlibrary/library_path/invalid.so b/tests/auto/qlibrary/library_path/invalid.so
new file mode 100644
index 0000000..4f8a56f
--- /dev/null
+++ b/tests/auto/qlibrary/library_path/invalid.so
@@ -0,0 +1 @@
+This should be an invalid shared object file.
diff --git a/tests/auto/qlibrary/qlibrary.pro b/tests/auto/qlibrary/qlibrary.pro
new file mode 100644
index 0000000..f3e646a
--- /dev/null
+++ b/tests/auto/qlibrary/qlibrary.pro
@@ -0,0 +1,9 @@
+TEMPLATE    =	subdirs
+CONFIG  += ordered
+SUBDIRS	=	lib \
+                lib2 \
+		tst
+TARGET = tst_qlibrary
+
+# no special install rule for subdir
+INSTALLS =
diff --git a/tests/auto/qlibrary/tst/tst.pro b/tests/auto/qlibrary/tst/tst.pro
new file mode 100644
index 0000000..67437a6
--- /dev/null
+++ b/tests/auto/qlibrary/tst/tst.pro
@@ -0,0 +1,23 @@
+load(qttest_p4)
+SOURCES         += ../tst_qlibrary.cpp
+TARGET  = ../tst_qlibrary
+QT = core
+
+win32 {
+  CONFIG(debug, debug|release) {
+    TARGET = ../../debug/tst_qlibrary
+} else {
+    TARGET = ../../release/tst_qlibrary
+  }
+}
+
+wince*: {
+   addFiles.sources = ../*.dll ../*.dl2 ../mylib_noextension
+   addFiles.path = .
+   DEPLOYMENT += addFiles
+   DEFINES += SRCDIR=\\\"\\\"
+} else {
+   DEFINES += SRCDIR=\\\"$$PWD/../\\\"
+}
+
+
diff --git a/tests/auto/qlibrary/tst_qlibrary.cpp b/tests/auto/qlibrary/tst_qlibrary.cpp
new file mode 100644
index 0000000..dea0c54e
--- /dev/null
+++ b/tests/auto/qlibrary/tst_qlibrary.cpp
@@ -0,0 +1,558 @@
+/****************************************************************************
+**
+** 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 <qlibrary.h>
+#include <QtCore/QRegExp>
+
+
+// Helper macros to let us know if some suffixes and prefixes 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)
+# undef sl_VALID
+# define sl_VALID       true
+#  ifndef __ia64
+#   define SUFFIX         ".sl"
+#   define PREFIX         "lib"
+#  else
+#   undef so_VALID
+#   define so_VALID       true
+#   define SUFFIX         ".so"
+#   define PREFIX         "lib"
+#  endif
+
+#elif defined(Q_OS_AIX)
+# undef a_VALID
+# undef so_VALID
+# define a_VALID        true
+# define so_VALID       true
+# define SUFFIX         ".a"
+# define PREFIX         "lib"
+
+#elif defined(Q_OS_WIN)
+# undef dll_VALID
+# define dll_VALID      true
+# define SUFFIX         ".dll"
+# 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 + "/" + PREFIX + fileName + SUFFIX;
+}
+
+//TESTED_CLASS=
+//TESTED_FILES=
+
+QT_FORWARD_DECLARE_CLASS(QLibrary)
+class tst_QLibrary : public QObject
+{
+    Q_OBJECT
+
+public:
+    tst_QLibrary();
+    virtual ~tst_QLibrary();
+
+enum QLibraryOperation {
+    Load = 1,
+    Unload = 2,
+    Resolve = 3,
+    OperationMask = 7,
+    DontSetFileName = 0x100
+};
+private slots:
+    void load();
+    void load_data();
+    void library_data();
+    void resolve_data();
+    void resolve();
+    void unload_data();
+    void unload();
+    void unload_after_implicit_load();
+    void isLibrary_data();
+    void isLibrary();
+    void version_data();
+    void version();
+    void errorString_data();
+    void errorString();
+    void loadHints();
+    void loadHints_data();
+    void fileName_data();
+    void fileName();
+    void multipleInstancesForOneLibrary();
+
+#ifdef Q_OS_WINCE
+private:
+    QCoreApplication* app;
+#endif
+};
+
+tst_QLibrary::tst_QLibrary()
+
+{
+#ifdef Q_OS_WINCE
+    char* argv = "app";
+    int argc = 1;
+    app = new QCoreApplication(argc,&argv);
+#endif
+}
+
+tst_QLibrary::~tst_QLibrary()
+{
+#ifdef Q_OS_WINCE
+    app->quit();
+#endif
+}
+
+
+typedef int (*VersionFunction)(void);
+
+void tst_QLibrary::version_data()
+{
+    QTest::addColumn<QString>("lib");
+    QTest::addColumn<int>("loadversion");
+    QTest::addColumn<int>("resultversion");
+
+    QTest::newRow( "ok00, version 1" ) << "mylib" << 1 << 1;
+    QTest::newRow( "ok00, version 2" ) << "mylib" << 2 << 2;
+    QTest::newRow( "ok00, default to last version" ) << "mylib" << -1 << 2;
+}
+
+void tst_QLibrary::version()
+{
+    QFETCH( QString, lib );
+    QFETCH( int, loadversion );
+    QFETCH( int, resultversion );
+
+#if QT_VERSION >= 0x040200 && !defined(Q_OS_AIX) && !defined(Q_OS_WIN)
+    QString currDir = QDir::currentPath();
+    QLibrary library( currDir + QLatin1Char('/') + lib, loadversion );
+    bool ok = library.load();
+    QVERIFY(ok);
+
+    VersionFunction fnVersion = (VersionFunction)library.resolve("version");
+    QVERIFY(fnVersion);
+    QCOMPARE(fnVersion(), resultversion);
+#else
+    Q_UNUSED(lib);
+    Q_UNUSED(loadversion);
+    Q_UNUSED(resultversion);
+#endif
+
+}
+
+void tst_QLibrary::load_data()
+{
+    QTest::addColumn<QString>("lib");
+    QTest::addColumn<bool>("result");
+
+    QString currDir = QDir::currentPath();
+    QTest::newRow( "ok00" ) << currDir + "/mylib" << (bool)true;
+    QTest::newRow( "notexist" ) << currDir + "/nolib" << (bool)false;
+    QTest::newRow( "badlibrary" ) << currDir + "/qlibrary.pro" << (bool)false;
+
+#ifdef Q_OS_MAC
+    QTest::newRow("ok (libmylib ver. 1)") << currDir + "/libmylib" <<(bool)true;
+#endif
+
+#if QT_VERSION >= 0x040103
+# if defined(Q_OS_WIN32) || defined(Q_OS_WINCE)
+    QTest::newRow( "ok01 (with suffix)" ) << currDir + "/mylib.dll" << (bool)true;
+    QTest::newRow( "ok02 (with non-standard suffix)" ) << currDir + "/mylib.dl2" << (bool)true;
+    QTest::newRow( "ok03 (with many dots)" ) << currDir + "/system.trolltech.test.mylib.dll" << (bool)true;
+# elif defined Q_OS_UNIX
+    QTest::newRow( "ok01 (with suffix)" ) << currDir + "/libmylib" SUFFIX << (bool)true;
+    QTest::newRow( "ok02 (with non-standard suffix)" ) << currDir + "/libmylib.so2" << (bool)true;
+    QTest::newRow( "ok03 (with non-standard suffix)" ) << currDir + "/system.trolltech.test.mylib.so" << (bool)true;
+# endif  // Q_OS_UNIX
+#endif   // QT_VERSION
+}
+
+void tst_QLibrary::load()
+{
+    QFETCH( QString, lib );
+    QFETCH( bool, result );
+
+    QLibrary library( lib );
+    bool ok = library.load();
+    if ( result ) {
+	QVERIFY( ok );
+    } else {
+	QVERIFY( !ok );
+    }
+}
+
+void tst_QLibrary::unload_data()
+{
+    QTest::addColumn<QString>("lib");
+    QTest::addColumn<bool>("result");
+
+    QString currDir = QDir::currentPath();
+    QTest::newRow( "mylib" ) << currDir + "/mylib" << (bool)TRUE;
+#ifdef Q_WS_MAC
+    if (QSysInfo::MacintoshVersion <= QSysInfo::MV_10_3)
+        QEXPECT_FAIL("mylib", "dlcompat cannot unload libraries", Continue);
+#endif
+    QTest::newRow( "ok01" ) << currDir + "/nolib" << (bool)FALSE;
+}
+
+void tst_QLibrary::unload()
+{
+    QFETCH( QString, lib );
+    QFETCH( bool, result );
+
+    QLibrary library( lib );
+    library.load();
+    bool ok = library.unload();
+    if ( result ) {
+	QVERIFY( ok );
+    } else {
+	QVERIFY( !ok );
+    }
+}
+
+void tst_QLibrary::unload_after_implicit_load()
+{
+    QLibrary library( "./mylib" );
+    void *p = library.resolve("version");
+    QVERIFY(p); // Check if it was loaded
+    QVERIFY(library.isLoaded());
+    QVERIFY(library.unload());
+    QCOMPARE(library.isLoaded(), false);
+
+}
+
+void tst_QLibrary::resolve_data()
+{
+    QTest::addColumn<QString>("lib");
+    QTest::addColumn<QString>("symbol");
+    QTest::addColumn<bool>("goodPointer");
+
+    QString currDir = QDir::currentPath();
+    QTest::newRow( "ok00" ) << currDir + "/mylib" << QString("version") << (bool)TRUE;
+    QTest::newRow( "bad00" ) << currDir + "/mylib" << QString("nosym") << (bool)FALSE;
+    QTest::newRow( "bad01" ) << currDir + "/nolib" << QString("nosym") << (bool)FALSE;
+}
+
+void tst_QLibrary::resolve()
+{
+    typedef int (*testFunc)();
+    QFETCH( QString, lib );
+    QFETCH( QString, symbol );
+    QFETCH( bool, goodPointer );
+
+    QLibrary library( lib );
+    testFunc func = (testFunc) library.resolve( symbol.toLatin1() );
+    if ( goodPointer ) {
+	QVERIFY( func != 0 );
+    } else {
+	QVERIFY( func == 0 );
+    }
+}
+
+void tst_QLibrary::library_data()
+{
+    QTest::addColumn<QString>("lib");
+}
+
+void tst_QLibrary::isLibrary_data()
+{
+    QTest::addColumn<QString>("filename");
+    QTest::addColumn<bool>("valid");
+
+    // use the macros #defined at the top of the file
+    QTest::newRow("bad") << QString("mylib.bad") << false;
+    QTest::newRow(".a") << QString("mylib.a") << a_VALID;
+    QTest::newRow(".bundle") << QString("mylib.bundle") << bundle_VALID;
+    QTest::newRow(".dll") << QString("mylib.dll") << dll_VALID;
+    QTest::newRow(".dl2" ) << QString("mylib.dl2") << false;
+    QTest::newRow(".dylib") << QString("mylib.dylib") << dylib_VALID;
+    QTest::newRow(".sl") << QString("mylib.sl") << sl_VALID;
+    QTest::newRow(".so") << QString("mylib.so") << so_VALID;
+    QTest::newRow(".so+version") << QString("mylib.so.0") << so_VALID;
+
+    // special tests:
+#ifndef Q_OS_MAC
+    QTest::newRow("version+.so") << QString("libc-2.7.so") << so_VALID;
+    QTest::newRow("version+.so+version") << QString("liboil-0.3.so.0.1.0") << so_VALID;
+#else
+    QTest::newRow("version+.so") << QString("libc-2.7.so") << false;
+    QTest::newRow("version+.so+version") << QString("liboil-0.3.so.0.1.0") << false;
+#endif
+#ifdef Q_OS_MAC
+    QTest::newRow("good (libmylib.1.0.0.dylib)") << QString("libmylib.1.0.0.dylib") << true;
+    QTest::newRow("good (libmylib.dylib)") << QString("libmylib.dylib") << true;
+    QTest::newRow("good (libmylib.so)") << QString("libmylib.so") << true;
+    QTest::newRow("good (libmylib.so.1.0.0)") << QString("libmylib.so.1.0.0") << true;
+
+    QTest::newRow("bad (libmylib.1.0.0.foo)") << QString("libmylib.1.0.0.foo") << false;
+#elif defined(Q_OS_WIN)
+    QTest::newRow("good (with many dots)" ) << "/system.trolltech.test.mylib.dll" << true;
+#endif
+}
+
+void tst_QLibrary::isLibrary()
+{
+    QFETCH( QString, filename );
+    QFETCH( bool, valid );
+
+    QCOMPARE(QLibrary::isLibrary(filename), valid);
+}
+
+void tst_QLibrary::errorString_data()
+{
+    QTest::addColumn<int>("operation");
+    QTest::addColumn<QString>("fileName");
+    QTest::addColumn<bool>("success");
+    QTest::addColumn<QString>("errorString");
+
+    QString currDir = QDir::currentPath();
+    QString srcDir = SRCDIR;
+    if (srcDir.isEmpty())
+        srcDir = currDir;
+
+    QTest::newRow("bad load()") << (int)Load << QString("nosuchlib") << false << QString("Cannot load library nosuchlib: .*");
+    QTest::newRow("call errorString() on QLibrary with no d-pointer (crashtest)") << (int)(Load | DontSetFileName) << QString() << false << QString("Unknown error");
+#ifdef Q_OS_WINCE
+    QTest::newRow("bad resolve") << (int)Resolve << currDir + "/mylib" << false << QString("Cannot resolve symbol \"nosuchsymbol\" in .*: .*");
+#else
+    QTest::newRow("bad resolve") << (int)Resolve << currDir + "/mylib" << false << QString("Cannot resolve symbol \"nosuchsymbol\" in \\S+: .*");
+#endif
+    QTest::newRow("good resolve") << (int)Resolve << currDir + "/mylib" << true << QString("Unknown error");
+
+#ifdef Q_OS_WIN
+    QTest::newRow("bad load() with .dll suffix") << (int)Load << QString("nosuchlib.dll") << false << QString("Cannot load library nosuchlib.dll: The specified module could not be found.");
+//    QTest::newRow("bad unload") << (int)Unload << QString("nosuchlib.dll") << false << QString("QLibrary::unload_sys: Cannot unload nosuchlib.dll (The specified module could not be found.)");
+#elif defined Q_OS_MAC
+#else
+    QTest::newRow("load invalid file") << (int)Load << srcDir + "/library_path/invalid.so" << false << QString("Cannot load library.*");
+#endif
+}
+
+void tst_QLibrary::errorString()
+{
+    QFETCH(int, operation);
+    QFETCH(QString, fileName);
+    QFETCH(bool, success);
+    QFETCH(QString, errorString);
+
+    QLibrary lib;
+    if (!(operation & DontSetFileName)) {
+        lib.setFileName(fileName);
+    }
+
+    bool ok = false;
+    switch (operation & OperationMask) {
+        case Load:
+            ok = lib.load();
+            break;
+        case Unload:
+            ok = lib.load();    //###
+            ok = lib.unload();
+            break;
+        case Resolve: {
+            ok = lib.load();
+            QCOMPARE(ok, true);
+            if (success) {
+                ok = lib.resolve("version");
+            } else {
+                ok = lib.resolve("nosuchsymbol");
+            }
+            break;}
+        default:
+            Q_ASSERT(0);
+            break;
+    }
+    QRegExp re(errorString);
+    QVERIFY2(re.exactMatch(lib.errorString()), qPrintable(lib.errorString()));
+    QCOMPARE(ok, success);
+}
+
+void tst_QLibrary::loadHints_data()
+{
+    QTest::addColumn<QString>("lib");
+    QTest::addColumn<int>("loadHints");
+    QTest::addColumn<bool>("result");
+
+    QLibrary::LoadHints lh;
+#if QT_VERSION >= 0x040300 && defined(Q_OS_AIX)
+    if (QFile::exists("/usr/lib/libGL.a") || QFile::exists("/usr/X11R6/lib/libGL.a")) {
+# if QT_POINTER_SIZE == 4
+        QTest::newRow( "ok03 (Archive member)" ) << "libGL.a(shr.o)" << int(QLibrary::LoadArchiveMemberHint) << (bool)TRUE;
+# else
+        QTest::newRow( "ok03 (Archive member)" ) << "libGL.a(shr_64.o)" << int(QLibrary::LoadArchiveMemberHint) << (bool)TRUE;
+#endif
+    }
+#endif	// QT_VERSION
+
+#if QT_VERSION >= 0x040103
+    QString currDir = QDir::currentPath();
+    lh |= QLibrary::ResolveAllSymbolsHint;
+# if defined(Q_OS_WIN32) || defined(Q_OS_WINCE)
+    QTest::newRow( "ok01 (with suffix)" ) << currDir + "/mylib.dll" << int(lh) << (bool)TRUE;
+    QTest::newRow( "ok02 (with non-standard suffix)" ) << currDir + "/mylib.dl2" << int(lh) << (bool)TRUE;
+    QTest::newRow( "ok03 (with many dots)" ) << currDir + "/system.trolltech.test.mylib.dll" << int(lh) << (bool)TRUE;
+# elif defined Q_OS_UNIX
+    QTest::newRow( "ok01 (with suffix)" ) << currDir + "/libmylib" SUFFIX << int(lh) << (bool)TRUE;
+    QTest::newRow( "ok02 (with non-standard suffix)" ) << currDir + "/libmylib.so2" << int(lh) << (bool)TRUE;
+    QTest::newRow( "ok03 (with many dots)" ) << currDir + "/system.trolltech.test.mylib.so" << int(lh) << (bool)TRUE;
+# endif  // Q_OS_UNIX
+#endif   // QT_VERSION
+
+}
+
+void tst_QLibrary::loadHints()
+{
+    QFETCH( QString, lib );
+    QFETCH( int, loadHints);
+    QFETCH( bool, result );
+    //QLibrary library( lib );
+    QLibrary library;
+    QLibrary::LoadHints lh(loadHints);
+    if (int(loadHints) != 0) {
+        lh |= library.loadHints();
+        library.setLoadHints(lh);
+    }
+    library.setFileName(lib);
+    QCOMPARE(library.loadHints(), lh);
+    bool ok = library.load();
+    if ( result ) {
+        QVERIFY( ok );
+    } else {
+        QVERIFY( !ok );
+    }
+}
+
+void tst_QLibrary::fileName_data()
+{
+    QTest::addColumn<QString>("libName");
+    QTest::addColumn<QString>("expectedFilename");
+
+    QString currDir = QDir::currentPath();
+    QTest::newRow( "ok02" ) << sys_qualifiedLibraryName(QLatin1String("mylib"))
+                            << sys_qualifiedLibraryName(QLatin1String("mylib"));
+#ifdef Q_WS_WIN
+#ifndef Q_OS_WINCE
+    QTest::newRow( "ok02" ) << "user32"
+                            << "USER32.dll";
+#else
+    QTest::newRow( "ok02" ) << "coredll"
+                            << "coredll.dll";
+#endif
+#endif
+}
+
+void tst_QLibrary::fileName()
+{
+    QFETCH( QString, libName);
+    QFETCH( QString, expectedFilename);
+
+    QLibrary lib(libName);
+    bool ok = lib.load();
+    if (!ok) {
+        qDebug() << lib.errorString();
+    }
+
+    QVERIFY(ok);
+    QCOMPARE(lib.fileName(), expectedFilename);
+
+}
+
+void tst_QLibrary::multipleInstancesForOneLibrary()
+{
+    QString lib = QDir::currentPath() + "/mylib";
+    QLibrary lib1(lib);
+    QLibrary lib2(lib);
+    QCOMPARE(lib1.isLoaded(), false);
+    QCOMPARE(lib2.isLoaded(), false);
+    lib1.load();
+    QCOMPARE(lib1.isLoaded(), true);
+    QCOMPARE(lib2.isLoaded(), true);
+    QCOMPARE(lib1.unload(), true);
+    QCOMPARE(lib1.isLoaded(), false);
+    QCOMPARE(lib2.isLoaded(), false);
+    lib1.load();
+    lib2.load();
+    QCOMPARE(lib1.isLoaded(), true);
+    QCOMPARE(lib2.isLoaded(), true);
+    QCOMPARE(lib1.unload(), false);
+    QCOMPARE(lib1.isLoaded(), true);
+    QCOMPARE(lib2.isLoaded(), true);
+    QCOMPARE(lib2.unload(), true);
+    QCOMPARE(lib1.isLoaded(), false);
+    QCOMPARE(lib2.isLoaded(), false);
+
+    // Finally; unload on that is already unloaded
+    QCOMPARE(lib1.unload(), false);
+
+/*
+    lib1.setLoadHints(QLibrary::ResolveAllSymbolsHint);
+    lib2.setLoadHints(QLibrary::ExportExternalSymbolHint);
+*/
+}
+
+QTEST_APPLESS_MAIN(tst_QLibrary)
+#include "tst_qlibrary.moc"