----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/124493/#review83061 -----------------------------------------------------------
CMakeLists.txt (line 115) <https://git.reviewboard.kde.org/r/124493/#comment57344> Let's reuse the existing `QT_VERSION` instead, e.g. ``` #if QT_VERSION < 0x050000 ... qt 4 code #else ... qt 5 code #endif ``` src/lib/marble/MarbleQuickItem.h (line 96) <https://git.reviewboard.kde.org/r/124493/#comment57338> const QString & src/lib/marble/MarbleQuickItem.h (line 149) <https://git.reviewboard.kde.org/r/124493/#comment57339> const QString & src/lib/marble/MarbleQuickItem.cpp (line 508) <https://git.reviewboard.kde.org/r/124493/#comment57343> The position marker in the screenshot is rendered by a plugin with nameId positionMarker. I don't think this call affects it, instead you have to iteratore over the float items manually and call setVisible(showPositionMarker) on the one with nameId() == "positionMarker". src/plugins/positionprovider/CMakeLists.txt (line 32) <https://git.reviewboard.kde.org/r/124493/#comment57340> Shall we just get rid of the Qt4 stuff here? src/plugins/positionprovider/qtmobility/QtMobilityPositionProviderPlugin.cpp (line 22) <https://git.reviewboard.kde.org/r/124493/#comment57341> does it work without the module (QtPositioning/) part also? That's the preferred way now. - Dennis Nienhüser On July 27, 2015, 5:18 p.m., Gábor Péterffy wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://git.reviewboard.kde.org/r/124493/ > ----------------------------------------------------------- > > (Updated July 27, 2015, 5:18 p.m.) > > > Review request for Marble. > > > Repository: marble > > > Description > ------- > > I have updated the qtmobility plugin to be able to compile with Qt5, and I > also enabled the PositionMarker render plugin for Marble Maps. > > Focusing to the current position will be in a new patch. Also I think the > current position marker has to be redesigned for the osm theme because now it > is hiding (see the screenshot). > > > Diffs > ----- > > CMakeLists.txt e74694a0da8507415a9a5472c4f09dfe2561f846 > src/apps/marble-maps/CMakeLists.txt > fff00ffc5ee4dcb3a78b5cdea18035e9267df1e9 > src/apps/marble-maps/MainScreen.qml > 5552a54eca8b37fa17588a14a035927418b23fbe > src/apps/marble-maps/create-apk.py f5fa5489aae2780b04f61b32b21e4c45bd3df85b > src/apps/marble-maps/package/AndroidManifest.xml > 3eee53b142c444a3f456208220b3e91ef5759219 > src/lib/marble/MarbleQuickItem.h 21b8fe5c4570ac894f668603a660da81f1d8a8e4 > src/lib/marble/MarbleQuickItem.cpp ee8bae8ea379cae3a0e6378259622a1ad88f8a2b > src/plugins/positionprovider/CMakeLists.txt > f9bfdd691d1905db29cad41af769320c694cd324 > src/plugins/positionprovider/qtmobility/CMakeLists.txt > 502513afef8f9bb9b23d70eb868c7a751c7fc4d6 > > src/plugins/positionprovider/qtmobility/QtMobilityPositionProviderPlugin.cpp > a2e6dca574564938813ed06466bf67b1a9900fcb > > Diff: https://git.reviewboard.kde.org/r/124493/diff/ > > > Testing > ------- > > > File Attachments > ---------------- > > Screenshot > > https://git.reviewboard.kde.org/media/uploaded/files/2015/07/27/22c65232-7061-4ec5-86f1-de4acbd95e05__Screenshot_2015-07-27-19-04-35.png > > > Thanks, > > Gábor Péterffy > >
_______________________________________________ Marble-devel mailing list [email protected] https://mail.kde.org/mailman/listinfo/marble-devel
