rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-20 10:54:14 +01:00
Code Issues Releases Activity

LP-30 set marble version to 15.08.1 and added patch to fix windows compilation issue

Browse Source
This commit is contained in:
Philippe Renon 2015-09-25 23:38:24 +02:00
parent 8f868d9e35
commit 445ca8c5ae
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
make/3rdparty/marble/marble-15.08.1.patch vendored Normal file
View File

@ -0,0 +1,13 @@
diff --git a/src/apps/marble-qt/QtMainWindow.cpp b/src/apps/marble-qt/QtMainWindow.cpp
index da9f44f..b3f4ee3 100644
--- a/src/apps/marble-qt/QtMainWindow.cpp
+++ b/src/apps/marble-qt/QtMainWindow.cpp
@@ -432,7 +432,7 @@ void MainWindow::createActions()
void MainWindow::createMenus( const QList<QAction*> &panelActions )
{
#ifdef Q_OS_WIN
- m_downloadAction.setEnabled( false );
+ m_downloadAction->setEnabled( false );
#endif
m_fileMenu = menuBar()->addMenu(tr("&File"));

4
make/3rdparty/marble/marble.mk vendored
View File

@ -31,8 +31,8 @@ MARBLE_NAME_SUFIX := -qt-$(QT_VERSION)
#
################################
MARBLE_VERSION := master
MARBLE_GIT_BRANCH := $(MARBLE_VERSION)
MARBLE_VERSION := 15.08.1
MARBLE_GIT_BRANCH := v$(MARBLE_VERSION)
MARBLE_BASE_NAME := marble-$(MARBLE_VERSION)
MARBLE_BUILD_CONF := Release