mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove support for older libgit2 - we now require 0.23 or later

Browse source 
Also fixes a capitalization error that prevented finding libssh2 in some
circumstances. And adds a missing include when building with libzip on Mac.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-12-14 22:34:15 -08:00
parent c8be04edad
commit 7aab635585
7 changed files with 34 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

8
desktop-widgets/mainwindow.cpp
View file

@ -197,13 +197,7 @@ MainWindow::MainWindow() : QMainWindow(),
plannerDetails->printPlan()->hide();
ui.menuFile->removeAction(ui.actionPrint);
#endif
#ifndef USE_LIBGIT23_API
ui.menuFile->removeAction(ui.actionCloudstorageopen);
ui.menuFile->removeAction(ui.actionCloudstoragesave);
qDebug() << "disabled / made invisible the cloud storage stuff";
#else
enableDisableCloudActions();
#endif
GpsLocation *locationProvider = new GpsLocation(&report_message, this);
if (!locationProvider->hasLocationsSource()) {
@ -314,10 +308,8 @@ void MainWindow::on_actionDiveSiteEdit_triggered() {
void MainWindow::enableDisableCloudActions()
{
#ifdef USE_LIBGIT23_API
ui.actionCloudstorageopen->setEnabled(prefs.cloud_verification_status == CS_VERIFIED);
ui.actionCloudstoragesave->setEnabled(prefs.cloud_verification_status == CS_VERIFIED);
#endif
}
PlannerDetails *MainWindow::plannerDetails() const {