-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/124526/
-----------------------------------------------------------
Review request for Marble.
Bugs: 350749
http://bugs.kde.org/show_bug.cgi?id=350749
Repository: marble
Description
-------
qt4/Qt/qconfig.h sets QT_NO_WEBKIT without checking whether it is installed or
not. This screws up our logic later on. The patch moves from QT_NO_WEBKIT to
MARBLE_NO_WEBKIT and tries to guess its value based on the cmake checks if not
given from the command line.
The patch is for master, a backport for Applications/15.04 is at
http://nienhueser.de/marble/marble-nowebkit-1508-1.diff
Diffs
-----
CMakeLists.txt e77f746
src/apps/marble-mobile/MobileMainWindow.cpp 89db918
src/lib/marble/CMakeLists.txt 78f5395
src/lib/marble/LegendWidget.cpp 8158416
src/lib/marble/MarbleLegendBrowser.h 936eedb
src/lib/marble/MarbleLegendBrowser.cpp 3af1f80
src/lib/marble/PopupItem.h 9947a78
src/lib/marble/PopupItem.cpp 41e108a
src/lib/marble/cloudsync/RouteItemDelegate.cpp 03be997
src/lib/marble/routing/RoutingInputWidget.cpp 2ec32f0
src/plugins/render/CMakeLists.txt bffeb6b
Diff: https://git.reviewboard.kde.org/r/124526/diff/
Testing
-------
Compiling Applications/15.04 branch with Qt 4.8 + QtWebKit installed, and
master with Qt 5.5 Desktop and Qt 5.5 Android
Thanks,
Dennis Nienhüser
_______________________________________________
Marble-devel mailing list
[email protected]
https://mail.kde.org/mailman/listinfo/marble-devel
