diff --git a/daemon b/daemon
index a204b71769f168f4ece750e0faf369f4b91f7ce2..e4fa5074cac04f7ba5f8e86b4ce371a3af6a0961 160000
--- a/daemon
+++ b/daemon
@@ -1 +1 @@
-Subproject commit a204b71769f168f4ece750e0faf369f4b91f7ce2
+Subproject commit e4fa5074cac04f7ba5f8e86b4ce371a3af6a0961
diff --git a/src/app/mainapplication.cpp b/src/app/mainapplication.cpp
index dd3e143d6ec1da4dd20a89604aa03ea4aef2eada..efa1012a3d2804a09fb9ceb03ef99a1c7a060d97 100644
--- a/src/app/mainapplication.cpp
+++ b/src/app/mainapplication.cpp
@@ -52,10 +52,6 @@
#include "dbuserrorhandler.h"
#endif
-#if defined _MSC_VER
-#include <gnutls/gnutls.h>
-#endif
-
static QString
getRenderInterfaceString()
{
@@ -140,10 +136,6 @@ MainApplication::init()
settingsManager_->loadTranslations();
setApplicationFont();
-#if defined _MSC_VER
- gnutls_global_init();
-#endif
-
initLrc(runOptions_[Option::UpdateUrl].toString(),
connectivityMonitor_.get(),
runOptions_[Option::Debug].toBool() && !runOptions_[Option::MuteJamid].toBool());
diff --git a/tests/qml/main.cpp b/tests/qml/main.cpp
index d7b6af0c907e9de6b0c180e09f686a39d14203c3..b31275fdaca9e69c0c2cd58e9b93c4b7d2abe5c7 100644
--- a/tests/qml/main.cpp
+++ b/tests/qml/main.cpp
@@ -40,123 +40,129 @@
#include <windows.h>
#endif
-#if defined _MSC_VER && !COMPILE_ONLY
-#include <gnutls/gnutls.h>
-#endif
-
-class Setup : public QObject {
- Q_OBJECT
+class Setup : public QObject
+{
+ Q_OBJECT
public:
- Setup(bool muteDring = false) : muteDring_(muteDring) {}
+ Setup(bool muteDring = false)
+ : muteDring_(muteDring)
+ {}
- void init() {
- connectivityMonitor_.reset(new ConnectivityMonitor(this));
- settingsManager_.reset(new AppSettingsManager(this));
- systemTray_.reset(new SystemTray(settingsManager_.get(), this));
+ void init()
+ {
+ connectivityMonitor_.reset(new ConnectivityMonitor(this));
+ settingsManager_.reset(new AppSettingsManager(this));
+ systemTray_.reset(new SystemTray(settingsManager_.get(), this));
- QFontDatabase::addApplicationFont(":/images/FontAwesome.otf");
+ QFontDatabase::addApplicationFont(":/images/FontAwesome.otf");
#if defined _MSC_VER && !COMPILE_ONLY
- gnutls_global_init();
+ gnutls_global_init();
#endif
- lrcInstance_.reset(new LRCInstance(nullptr, nullptr, "",
- connectivityMonitor_.get(), muteDring_));
- lrcInstance_->subscribeToDebugReceived();
-
- auto downloadPath = settingsManager_->getValue(Settings::Key::DownloadPath);
- lrcInstance_->accountModel().downloadDirectory =
- downloadPath.toString() + "/";
- }
-
- void qmlEngineRegistration(QQmlEngine *engine) {
- // Expose custom types to the QML engine.
- Utils::registerTypes(engine, systemTray_.get(), lrcInstance_.get(),
- settingsManager_.get(), previewEngine_.get(),
- &screenInfo_, this);
- }
+ lrcInstance_.reset(
+ new LRCInstance(nullptr, nullptr, "", connectivityMonitor_.get(), muteDring_));
+ lrcInstance_->subscribeToDebugReceived();
+
+ auto downloadPath = settingsManager_->getValue(Settings::Key::DownloadPath);
+ lrcInstance_->accountModel().downloadDirectory = downloadPath.toString() + "/";
+ }
+
+ void qmlEngineRegistration(QQmlEngine* engine)
+ {
+ // Expose custom types to the QML engine.
+ Utils::registerTypes(engine,
+ systemTray_.get(),
+ lrcInstance_.get(),
+ settingsManager_.get(),
+ previewEngine_.get(),
+ &screenInfo_,
+ this);
+ }
public Q_SLOTS:
- /*!
- * Called once before qmlEngineAvailable.
- */
- void applicationAvailable() { init(); }
-
- /*!
- * Called when the QML engine is available. Any import paths, plugin paths,
- * and extra file selectors will have been set on the engine by this point.
- * This function is called once for each QML test file, so any arguments are
- * unique to that test. For example, this means that each QML test file will
- * have its own QML engine.
- *
- * This function can be used to register QML types and add import paths,
- * amongst other things.
- */
- void qmlEngineAvailable(QQmlEngine *engine) {
- auto videoProvider = new VideoProvider(lrcInstance_->avModel(), this);
- engine->rootContext()->setContextProperty("videoProvider", videoProvider);
+ /*!
+ * Called once before qmlEngineAvailable.
+ */
+ void applicationAvailable() { init(); }
+
+ /*!
+ * Called when the QML engine is available. Any import paths, plugin paths,
+ * and extra file selectors will have been set on the engine by this point.
+ * This function is called once for each QML test file, so any arguments are
+ * unique to that test. For example, this means that each QML test file will
+ * have its own QML engine.
+ *
+ * This function can be used to register QML types and add import paths,
+ * amongst other things.
+ */
+ void qmlEngineAvailable(QQmlEngine* engine)
+ {
+ auto videoProvider = new VideoProvider(lrcInstance_->avModel(), this);
+ engine->rootContext()->setContextProperty("videoProvider", videoProvider);
#ifdef WITH_WEBENGINE
- engine->rootContext()->setContextProperty("WITH_WEBENGINE", QVariant(true));
+ engine->rootContext()->setContextProperty("WITH_WEBENGINE", QVariant(true));
#else
- engine->rootContext()->setContextProperty("WITH_WEBENGINE",
- QVariant(false));
+ engine->rootContext()->setContextProperty("WITH_WEBENGINE", QVariant(false));
#endif
- qmlEngineRegistration(engine);
- }
+ qmlEngineRegistration(engine);
+ }
- /*!
- * Called once right after the all test execution has finished. Use this
- * function to clean up before everything is destroyed.
- */
- void cleanupTestCase() {}
+ /*!
+ * Called once right after the all test execution has finished. Use this
+ * function to clean up before everything is destroyed.
+ */
+ void cleanupTestCase() {}
private:
- QScopedPointer<LRCInstance> lrcInstance_;
+ QScopedPointer<LRCInstance> lrcInstance_;
- QScopedPointer<ConnectivityMonitor> connectivityMonitor_;
- QScopedPointer<AppSettingsManager> settingsManager_;
- QScopedPointer<SystemTray> systemTray_;
- QScopedPointer<PreviewEngine> previewEngine_;
- ScreenInfo screenInfo_;
+ QScopedPointer<ConnectivityMonitor> connectivityMonitor_;
+ QScopedPointer<AppSettingsManager> settingsManager_;
+ QScopedPointer<SystemTray> systemTray_;
+ QScopedPointer<PreviewEngine> previewEngine_;
+ ScreenInfo screenInfo_;
- bool muteDring_{false};
+ bool muteDring_ {false};
};
-int main(int argc, char **argv) {
- QDir tempDir(QStandardPaths::writableLocation(QStandardPaths::TempLocation));
+int
+main(int argc, char** argv)
+{
+ QDir tempDir(QStandardPaths::writableLocation(QStandardPaths::TempLocation));
- auto jamiDataDir = tempDir.absolutePath() + "\\jami_test\\jami";
- auto jamiConfigDir = tempDir.absolutePath() + "\\jami_test\\.config";
- auto jamiCacheDir = tempDir.absolutePath() + "\\jami_test\\.cache";
+ auto jamiDataDir = tempDir.absolutePath() + "\\jami_test\\jami";
+ auto jamiConfigDir = tempDir.absolutePath() + "\\jami_test\\.config";
+ auto jamiCacheDir = tempDir.absolutePath() + "\\jami_test\\.cache";
- bool envSet = qputenv("JAMI_DATA_HOME", jamiDataDir.toLocal8Bit());
- envSet &= qputenv("JAMI_CONFIG_HOME", jamiConfigDir.toLocal8Bit());
- envSet &= qputenv("JAMI_CACHE_HOME", jamiCacheDir.toLocal8Bit());
- if (!envSet)
- return 1;
+ bool envSet = qputenv("JAMI_DATA_HOME", jamiDataDir.toLocal8Bit());
+ envSet &= qputenv("JAMI_CONFIG_HOME", jamiConfigDir.toLocal8Bit());
+ envSet &= qputenv("JAMI_CACHE_HOME", jamiCacheDir.toLocal8Bit());
+ if (!envSet)
+ return 1;
- bool muteDring{false};
+ bool muteDring {false};
- // Remove "-mutejamid" from argv, as quick_test_main_with_setup() will
- // fail if given an invalid command-line argument.
- auto end = std::remove_if(argv + 1, argv + argc, [](char *argv) {
- return (strcmp(argv, "-mutejamid") == 0);
- });
+ // Remove "-mutejamid" from argv, as quick_test_main_with_setup() will
+ // fail if given an invalid command-line argument.
+ auto end = std::remove_if(argv + 1, argv + argc, [](char* argv) {
+ return (strcmp(argv, "-mutejamid") == 0);
+ });
- if (end != argv + argc) {
- muteDring = true;
+ if (end != argv + argc) {
+ muteDring = true;
- // Adjust the argument count.
- argc = std::distance(argv, end);
- }
+ // Adjust the argument count.
+ argc = std::distance(argv, end);
+ }
#ifdef WITH_WEBENGINE
- QtWebEngineQuick::initialize();
+ QtWebEngineQuick::initialize();
#endif
- QTEST_SET_MAIN_SOURCE_PATH
- Setup setup(muteDring);
- return quick_test_main_with_setup(argc, argv, "qml_test", nullptr, &setup);
+ QTEST_SET_MAIN_SOURCE_PATH
+ Setup setup(muteDring);
+ return quick_test_main_with_setup(argc, argv, "qml_test", nullptr, &setup);
}
#include "main.moc"
diff --git a/tests/unittests/globaltestenvironment.h b/tests/unittests/globaltestenvironment.h
index 58596be83ad5b8e40591da91469d14173158e1e7..4faccb57d0750622c9b061bb687d31c2d527c6f1 100644
--- a/tests/unittests/globaltestenvironment.h
+++ b/tests/unittests/globaltestenvironment.h
@@ -33,10 +33,6 @@
#include <windows.h>
#endif
-#if defined _MSC_VER && !COMPILE_ONLY
-#include <gnutls/gnutls.h>
-#endif
-
class TestEnvironment
{
public: