Remove qtsparkle support
This commit is contained in:
parent
6377f297bb
commit
8b765a5257
|
@ -78,7 +78,6 @@ pkg_check_modules(TAGLIB taglib)
|
||||||
|
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
find_package(ZLIB REQUIRED)
|
find_package(ZLIB REQUIRED)
|
||||||
find_library(QTSPARKLE_LIBRARIES qtsparkle-qt5)
|
|
||||||
endif (WIN32)
|
endif (WIN32)
|
||||||
|
|
||||||
find_library(LASTFM5_LIBRARIES lastfm5)
|
find_library(LASTFM5_LIBRARIES lastfm5)
|
||||||
|
|
|
@ -1357,7 +1357,6 @@ if (WIN32)
|
||||||
target_link_libraries(clementine_lib
|
target_link_libraries(clementine_lib
|
||||||
protobuf
|
protobuf
|
||||||
${ZLIB_LIBRARIES}
|
${ZLIB_LIBRARIES}
|
||||||
${QTSPARKLE_LIBRARIES}
|
|
||||||
tinysvcmdns
|
tinysvcmdns
|
||||||
dsound
|
dsound
|
||||||
)
|
)
|
||||||
|
|
|
@ -96,10 +96,6 @@ QDBusArgument& operator<<(QDBusArgument& arg, const QImage& image);
|
||||||
const QDBusArgument& operator>>(const QDBusArgument& arg, QImage& image);
|
const QDBusArgument& operator>>(const QDBusArgument& arg, QImage& image);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef Q_OS_WIN32
|
|
||||||
#include <qtsparkle-qt5/Updater>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Load sqlite plugin on windows and mac.
|
// Load sqlite plugin on windows and mac.
|
||||||
#include <QtPlugin>
|
#include <QtPlugin>
|
||||||
Q_IMPORT_PLUGIN(QSQLiteDriverPlugin)
|
Q_IMPORT_PLUGIN(QSQLiteDriverPlugin)
|
||||||
|
@ -415,11 +411,6 @@ int main(int argc, char* argv[]) {
|
||||||
LoadTranslation("clementine", a.applicationDirPath(), language);
|
LoadTranslation("clementine", a.applicationDirPath(), language);
|
||||||
LoadTranslation("clementine", QDir::currentPath(), language);
|
LoadTranslation("clementine", QDir::currentPath(), language);
|
||||||
|
|
||||||
#ifdef Q_OS_WIN32
|
|
||||||
// Set the language for qtsparkle
|
|
||||||
qtsparkle::LoadTranslations(language);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Icons
|
// Icons
|
||||||
IconLoader::Init();
|
IconLoader::Init();
|
||||||
|
|
||||||
|
|
|
@ -38,10 +38,6 @@
|
||||||
#include <QUndoStack>
|
#include <QUndoStack>
|
||||||
#include <QtDebug>
|
#include <QtDebug>
|
||||||
|
|
||||||
#ifdef Q_OS_WIN32
|
|
||||||
#include <qtsparkle-qt5/Updater>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "core/appearance.h"
|
#include "core/appearance.h"
|
||||||
#include "core/application.h"
|
#include "core/application.h"
|
||||||
#include "core/backgroundstreams.h"
|
#include "core/backgroundstreams.h"
|
||||||
|
@ -834,15 +830,6 @@ MainWindow::MainWindow(Application* app, SystemTrayIcon* tray_icon, OSD* osd,
|
||||||
connect(check_updates, SIGNAL(triggered(bool)), SLOT(CheckForUpdates()));
|
connect(check_updates, SIGNAL(triggered(bool)), SLOT(CheckForUpdates()));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef Q_OS_WIN32
|
|
||||||
qLog(Debug) << "Creating sparkle updater";
|
|
||||||
qtsparkle::Updater* updater = new qtsparkle::Updater(
|
|
||||||
QUrl("https://clementine-data.appspot.com/sparkle-windows"), this);
|
|
||||||
updater->SetNetworkAccessManager(new NetworkAccessManager(this));
|
|
||||||
updater->SetVersion(CLEMENTINE_VERSION_SPARKLE);
|
|
||||||
connect(check_updates, SIGNAL(triggered()), updater, SLOT(CheckNow()));
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Global shortcuts
|
// Global shortcuts
|
||||||
connect(global_shortcuts_, SIGNAL(Play()), app_->player(), SLOT(Play()));
|
connect(global_shortcuts_, SIGNAL(Play()), app_->player(), SLOT(Play()));
|
||||||
connect(global_shortcuts_, SIGNAL(Pause()), app_->player(), SLOT(Pause()));
|
connect(global_shortcuts_, SIGNAL(Pause()), app_->player(), SLOT(Pause()));
|
||||||
|
|
Loading…
Reference in New Issue