[Marble-devel] Review Request 124193: QT_NO_WEBKIT option

[Dennis Nienhüser]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/124193/#review81800
-----------------------------------------------------------



src/apps/CMakeLists.txt (line 6)
<https://git.reviewboard.kde.org/r/124193/#comment56129>

    else()
     add_...(marble_android)
    endif()



src/apps/marble_android/CMakeLists.txt (line 20)
<https://git.reviewboard.kde.org/r/124193/#comment56131>

    wrap it into?
    if (ANDROID)
     ...
    endif()



src/lib/marble/CMakeLists.txt (line 58)
<https://git.reviewboard.kde.org/r/124193/#comment56126>

    There's way too much duplication here. Please call set(marblewidget_SRCS ...) first with all sources that are common on all targets. Then add further depending on the QT_NO_WEBKIT switch. cmake has the LIST(APPEND ...) command, see http://www.cmake.org/Wiki/CMake_Performance_Tips#Use_LIST.28APPEND_....29



src/lib/marble/CMakeLists.txt (line 531)
<https://git.reviewboard.kde.org/r/124193/#comment56127>

    see above



src/lib/marble/CMakeLists.txt (line 706)
<https://git.reviewboard.kde.org/r/124193/#comment56128>

    see above


I'd prefer naming things NullFoo, VoidFoo or DummyFoo instead of FooQtNoWebkit. So we'd have a NullWebBrowser, for example.

- Dennis Nienhüser


On June 27, 2015, 7:22 a.m., Gábor Péterffy wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/124193/
> -----------------------------------------------------------
> 
> (Updated June 27, 2015, 7:22 a.m.)
> 
> 
> Review request for Marble.
> 
> 
> Repository: marble
> 
> 
> Description
> -------
> 
> This patch includes some little bugfixes and some bulk class to compile without QtWebKit.
> 
> Previous review request:
> https://git.reviewboard.kde.org/r/124064/
> 
> 
> Diffs
> -----
> 
>   src/CMakeLists.txt 78b83a39ac26b17b82b072d6309bb30d88bf6534 
>   src/apps/CMakeLists.txt 2834e13025bf70a202163992e849a92e2801e1cf 
>   src/apps/marble_android/CMakeLists.txt PRE-CREATION 
>   src/apps/marble_android/main.cpp PRE-CREATION 
>   src/lib/marble/CMakeLists.txt 8b36d0843f585c09c62bf044d0cfb0651a13d4b0 
>   src/lib/marble/HttpJob.cpp 249b6800a4c0bfbc944020eb25019400bd4eff34 
>   src/lib/marble/LegendWidget.cpp b74373c92830856f29d3759f682dbf89c3dab6ae 
>   src/lib/marble/LegendWidgetQtNoWebkit.ui PRE-CREATION 
>   src/lib/marble/MarbleLegendBrowser.h 7e80c389f9e8f0fe3876dc4fe23d917e70a078d9 
>   src/lib/marble/MarbleLegendBrowser.cpp f628b835534063aa459d67ddff10f33466ac59cd 
>   src/lib/marble/MarbleModel.cpp 04605c6f7261d03e720a3c071a63f459f982d909 
>   src/lib/marble/MarbleWebViewQtNoWebkit.h PRE-CREATION 
>   src/lib/marble/MarbleWebViewQtNoWebkit.cpp PRE-CREATION 
>   src/lib/marble/PopupItem.h 4c65004d1386305c3394f5b343bc67cff9127f39 
>   src/lib/marble/PopupItem.cpp 8dd885c6efa4ed1c0981f835339b031720a24d01 
>   src/lib/marble/TinyWebBrowserQtNoWebkit.h PRE-CREATION 
>   src/lib/marble/TinyWebBrowserQtNoWebkit.cpp PRE-CREATION 
>   src/lib/marble/WebPopupWidgetQtNoWebkit.ui PRE-CREATION 
>   src/lib/marble/cloudsync/RouteItemDelegate.cpp 9670f1e3ccb643bab5400e84e01129b9cc6826a4 
>   src/lib/marble/routing/RoutingInputWidget.cpp 40c4aad9a93d3255a66fbfb98487401ee597321e 
> 
> Diff: https://git.reviewboard.kde.org/r/124193/diff/
> 
> 
> Testing
> -------
> 
> 
> Thanks,
> 
> Gábor Péterffy
> 
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/marble-devel/attachments/20150627/970ee44c/attachment.html>