Hi,
I needed a marblewidget on windows for Qt 5.5.1 and after a while I got it to
build
from the V15.08.2 tag in git - it looked like the newest stable version to me
;-)
However, we're still using MSVC2010 and it's tiny little brain needed two minor
changes to the source and a simple syntax fix. Please have a look at the
attached
diff - MSVC2010 is still supported by QT (it's included in the binary builds) -
to see if something like it could be of value,
thanks in advance,
Uli
Ulrich Teichert
Diplominformatiker
Resarch & Development
NEXT video systems
Hard- and Software Development GmbH
Oderstr. 47
24539 Neumünster
Germany
E-Mail: [email protected]
Web: www.vs-n.de
Geschaeftsfuehrer: Avi Zisman, Carl Cassista, Mathias Witt
Amtsgericht Kiel, HRB 12125 KI
USt-Id: DE 272 611 922
Diese E-Mail enthält vertrauliche und/oder rechtlich geschützte Informationen.
Wenn Sie nicht der richtige Adressat sind oder diese E-Mail irrtümlich erhalten
haben, informieren Sie bitte sofort den Absender und vernichten Sie diese
E-Mail. Das unerlaubte Kopieren sowie die unbefugte Weitergabe dieser E-Mail
ist nicht gestattet.
This e-mail may contain confidential and/or privileged information. If you are
not the intended recipient (or have received this e-mail in error) please
notify the sender immediately and destroy this e-mail. Any unauthorized
copying, disclosure or distribution of the material in this e-mail is strictly
forbidden.
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"));
diff --git a/src/lib/marble/LayerManager.cpp b/src/lib/marble/LayerManager.cpp
index 3748471..85fd88d 100644
--- a/src/lib/marble/LayerManager.cpp
+++ b/src/lib/marble/LayerManager.cpp
@@ -155,7 +155,7 @@ void LayerManager::renderLayers( GeoPainter *painter,
ViewportParams *viewport )
}
// sort them according to their zValue()s
- qSort( layers.begin(), layers.end(), [] ( const LayerInterface * const
one, const LayerInterface * const two ) {
+ qSort( layers.begin(), layers.end(), [] ( const LayerInterface * const
one, const LayerInterface * const two ) -> bool {
Q_ASSERT( one && two );
return one->zValue() < two->zValue();
} );
diff --git a/src/lib/marble/MarbleInputHandler.cpp
b/src/lib/marble/MarbleInputHandler.cpp
index 393ce42..b778d8e 100644
--- a/src/lib/marble/MarbleInputHandler.cpp
+++ b/src/lib/marble/MarbleInputHandler.cpp
@@ -697,7 +697,8 @@ bool
MarbleDefaultInputHandler::handleMouseEvent(QMouseEvent *event)
// handled, however.
if (event->type() != QEvent::MouseMove && !selectionRubber()->isVisible())
{
- foreach (AbstractFloatItem *floatItem,
MarbleInputHandler::d->m_marblePresenter->map()->floatItems())
+ QList<AbstractFloatItem *> items =
MarbleInputHandler::d->m_marblePresenter->map()->floatItems();
+ foreach (AbstractFloatItem *floatItem, items)
{
if ( floatItem->enabled() && floatItem->visible()
&& floatItem->contains( event->pos() ) )
_______________________________________________
Marble-devel mailing list
[email protected]
https://mail.kde.org/mailman/listinfo/marble-devel
