remove redundant QLibraryPrivate::qualifiedFileName member

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/core/plugin/qlibrary.cpp b/src/core/plugin/qlibrary.cpp
index 460b26c..9731f65 100644 (file)
--- a/src/core/plugin/qlibrary.cpp
+++ b/src/core/plugin/qlibrary.cpp
@@ -641,7 +641,7 @@ void QLibrary::setFileName(const QString &fileName)
 QString QLibrary::fileName() const
 {
     if (d)
-        return d->qualifiedFileName.isEmpty() ? d->fileName : d->qualifiedFileName;
+        return d->fileName;
     return QString();
 }
 

diff --git a/src/core/plugin/qlibrary_p.h b/src/core/plugin/qlibrary_p.h
index 5d56540..af327ef 100644 (file)
--- a/src/core/plugin/qlibrary_p.h
+++ b/src/core/plugin/qlibrary_p.h
@@ -52,7 +52,6 @@ public:
     void *pHnd;
 
     QString fileName;
-    QString qualifiedFileName;
 
     bool load();
     bool loadPlugin(); // loads and resolves instance

diff --git a/src/core/plugin/qlibrary_unix.cpp b/src/core/plugin/qlibrary_unix.cpp
index 207a81a..cb5c82d 100644 (file)
--- a/src/core/plugin/qlibrary_unix.cpp
+++ b/src/core/plugin/qlibrary_unix.cpp
@@ -55,7 +55,6 @@ bool QLibraryPrivate::load_sys()
     if (!pHnd) {
         errorString = QLibrary::tr("Cannot load library %1: %2").arg(fileName).arg(qdlerror());
     } else {
-        qualifiedFileName = fileName;
         errorString.clear();
     }
     return (pHnd != 0);