Fix for update manager. Installer assembly for MacOS in dmg image.

pawelsalawa · Jul 24, 2018 · 3644b37 · 3644b37
1 parent 9549277
commit 3644b37
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/SQLiteStudio3/coreSQLiteStudio/services/updatemanager.cpp b/SQLiteStudio3/coreSQLiteStudio/services/updatemanager.cpp
@@ -12,6 +12,8 @@
 UpdateManager::UpdateManager(QObject *parent) :
     QObject(parent)
 {
+    qRegisterMetaType<QList<UpdateManager::UpdateEntry>>();
+
     connect(this, SIGNAL(updatingError(QString)), NOTIFY_MANAGER, SLOT(error(QString)));
 
     QString updateBinary =

diff --git a/SQLiteStudio3/coreSQLiteStudio/services/updatemanager.h b/SQLiteStudio3/coreSQLiteStudio/services/updatemanager.h
@@ -44,6 +44,8 @@ class API_EXPORT UpdateManager : public QObject
         void updatingError(const QString& errorMessage);
 };
 
+Q_DECLARE_METATYPE(QList<UpdateManager::UpdateEntry>)
+
 #define UPDATES SQLITESTUDIO->getUpdateManager()
 
 #endif // PORTABLE_CONFIG

diff --git a/scripts/installer/assemble.tcl b/scripts/installer/assemble.tcl
@@ -151,7 +151,7 @@ proc defineGlobalVars {} {
 			set ::libPref "lib"
 			set ::dirsToSkipInPathBeginning 1
 			set qtCoreFile "$::portableDir/SQLiteStudio/SQLiteStudio.app/Contents/Frameworks/QtCore.framework/QtCore"
-			set ::output [file normalize $::targetDir/InstallSQLiteStudio-${::sqliteStudioVersion}]
+			set ::output [file normalize $::targetDir/InstallSQLiteStudio-${::sqliteStudioVersion}.dmg]
 		}
 		"win32" {
 			set ::portableDir [file normalize ../../output/portable]