-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://codereview.secondlife.com/r/46/
-----------------------------------------------------------
Review request for Viewer.
Summary
-------
This patch has only effect on standalone.
It searches for the Qt libs using the cmake provided FindQt4.cmake.
I added an explicit test to check if QTDIR is set, it is set to
the correct value (even LL got this wrong on their wiki, so it's
apparently not obvious): As of Qt 4, Qt is found by calling qmake,
NOT by looking at QTDIR. So, if you set QTDIR then it better be
set to whatever qmake was "found" (using PATH as usual).
While FindLLQtWebkit.cmake was added to the repository, it wasn't
used for some reason... but it works perfectly. This patch uses it
to find LLQtWebkit and then uses the resulting LLQTWEBKIT_LIBRARY
and LLQTWEBKIT_INCLUDE_DIR in the right places.
Finally, we also need to explicitly pass the Qt plugin libraries
in order to link with them, so part of this patch adds the rules
to do that (the foreach).
This addresses bug VWR-24252.
http://jira.secondlife.com/browse/VWR-24252
Diffs
-----
indra/cmake/WebKitLibPlugin.cmake b0689af42a71
indra/llplugin/CMakeLists.txt b0689af42a71
indra/media_plugins/webkit/CMakeLists.txt b0689af42a71
Diff: http://codereview.secondlife.com/r/46/diff
Testing
-------
I used this while working on adding plugin support to Imprudence, needing to
debug into the Qt libs and llqtwebkit. I added support for multiple versions of
llqtwebkit to imprudence (not just the one needed, but also newer versions of
llqtwebkit). Needless to say that I needed this patch to work to find my
(several) installations of Qt and llqtwebkit.
Thanks,
Aleric
_______________________________________________
Policies and (un)subscribe information available here:
http://wiki.secondlife.com/wiki/OpenSource-Dev
Please read the policies before posting to keep unmoderated posting privileges
