Update upstream source from tag 'upstream/3.4.4+dfsg'

Update to upstream version '3.4.4+dfsg'
with Debian dir 482614bd23f0ef52dabc9803477204ad88e917ed

6 files changed, 9 insertions, 20 deletions

diff --git a/SQLiteStudio3/Tests/TestUtils/TestUtils.pro b/SQLiteStudio3/Tests/TestUtils/TestUtils.pro
index 727fb74..3ea06e6 100644
--- a/SQLiteStudio3/Tests/TestUtils/TestUtils.pro
+++ b/SQLiteStudio3/Tests/TestUtils/TestUtils.pro
@@ -41,7 +41,7 @@ unix:!symbian {
     maemo5 {

         target.path = /opt/usr/lib

     } else {

-        target.path = /usr/lib

+        target.path = $$PREFIX/lib

     }

     INSTALLS += target

 }

diff --git a/SQLiteStudio3/Tests/TestUtils/configmock.cpp b/SQLiteStudio3/Tests/TestUtils/configmock.cpp
index c52fa1b..f5ce5c5 100644
--- a/SQLiteStudio3/Tests/TestUtils/configmock.cpp
+++ b/SQLiteStudio3/Tests/TestUtils/configmock.cpp
@@ -4,10 +4,6 @@ void ConfigMock::init()
 {
 }
 
-void ConfigMock::cleanUp()
-{
-}
-
 const QString& ConfigMock::getConfigDir()
 {
     static const QString cfg;
@@ -194,16 +190,6 @@ void ConfigMock::rollback()
 {
 }
 
-bool ConfigMock::setCollations(const QList<CollationManager::CollationPtr>&)
-{
-    return true;
-}
-
-QList<CollationManager::CollationPtr> ConfigMock::getCollations() const
-{
-    return QList<CollationManager::CollationPtr>();
-}
-
 const QString &ConfigMock::getConfigDir() const
 {
     static QString s;
diff --git a/SQLiteStudio3/Tests/TestUtils/configmock.h b/SQLiteStudio3/Tests/TestUtils/configmock.h
index a8a5a2c..620548b 100644
--- a/SQLiteStudio3/Tests/TestUtils/configmock.h
+++ b/SQLiteStudio3/Tests/TestUtils/configmock.h
@@ -9,7 +9,6 @@ class ConfigMock : public Config
 {
     public:
         void init();
-        void cleanUp();
         const QString& getConfigDir();
         void beginMassSave();
         void commitMassSave();
@@ -51,8 +50,6 @@ class ConfigMock : public Config
         void begin();
         void commit();
         void rollback();
-        bool setCollations(const QList<CollationManager::CollationPtr>&);
-        QList<CollationManager::CollationPtr> getCollations() const;
         const QString &getConfigDir() const;
         QString getConfigFilePath() const;
         bool isMassSaving() const;
diff --git a/SQLiteStudio3/Tests/TestUtils/extensionmanagermock.cpp b/SQLiteStudio3/Tests/TestUtils/extensionmanagermock.cpp
index dc4669b..d98fc42 100644
--- a/SQLiteStudio3/Tests/TestUtils/extensionmanagermock.cpp
+++ b/SQLiteStudio3/Tests/TestUtils/extensionmanagermock.cpp
@@ -17,3 +17,8 @@ QList<SqliteExtensionManager::ExtensionPtr> ExtensionManagerMock::getExtensionFo
 {
     return QList<SqliteExtensionManager::ExtensionPtr>();
 }
+
+QStringList ExtensionManagerMock::getExtensionDirs() const
+{
+    return QStringList();
+}
diff --git a/SQLiteStudio3/Tests/TestUtils/extensionmanagermock.h b/SQLiteStudio3/Tests/TestUtils/extensionmanagermock.h
index 7a7a1f4..37bd634 100644
--- a/SQLiteStudio3/Tests/TestUtils/extensionmanagermock.h
+++ b/SQLiteStudio3/Tests/TestUtils/extensionmanagermock.h
@@ -12,6 +12,7 @@ class ExtensionManagerMock : public SqliteExtensionManager
         void setExtensions(const QList<ExtensionPtr>&);
         QList<ExtensionPtr> getAllExtensions() const;
         QList<ExtensionPtr> getExtensionForDatabase(const QString&) const;
+        QStringList getExtensionDirs() const;
 };
 
 #endif // EXTENSIONMANAGERMOCK_H
diff --git a/SQLiteStudio3/Tests/TestUtils/test_common.pri b/SQLiteStudio3/Tests/TestUtils/test_common.pri
index 24d1479..4eb550b 100644
--- a/SQLiteStudio3/Tests/TestUtils/test_common.pri
+++ b/SQLiteStudio3/Tests/TestUtils/test_common.pri
@@ -1,5 +1,5 @@
-include($$PWD/../../dirs.pri)

-include($$PWD/../testdirs.pri)

+include($$PWD/../../common.pri)

+include($$PWD/../testcommon.pri)

 

 CONFIG += c++17