UseJava.cmake: simplify path logic

Move logic to determine relative path to .java file to after the file
extension check, so that it only executes when it is actually used.
UseJava.cmake: fix passing jars to add_jar

Fix setting classpath when encountering a jar argument to add_jar to
actually set the variable that is used to specify the classpath to
javac, instead of just uselessly appending the jar to
CMAKE_JAVA_INCLUDE_PATH (which is never used again at the point where it
is modified). Also, list jars so specified as dependencies of compiling
the java sources for the jar target.
UseJava.cmake: accept jar targets in add_jar

Modify add_jar to also accepts jars by target name.
Merge topic 'fix-java-jar-depends' into next

adeafad UseJava.cmake: accept jar targets in add_jar
53a05b8 UseJava.cmake: fix passing jars to add_jar
45c8e4b UseJava.cmake: simplify path logic
FindQt4: If Qt5 is in CMAKE_PREFIX_PATH, be sure to find Qt4 includes.
Merge topic 'findqt4-withqt5' into next

252bfd3 FindQt4: If Qt5 is in CMAKE_PREFIX_PATH, be sure to find Qt4 includes.
Use the QStandardItemModel workaround until 5.1.0.

If there is a Qt 5.0.3 release, it may or may not contain the patch
that fixes this issue.

 http://thread.gmane.org/gmane.comp.lib.qt.releasing/882

Just use the workaround until 5.1.0 which certainly will contain the
fix.
Merge topic 'expand-version-of-Qt5-gui-fix' into next

8acf851 Use the QStandardItemModel workaround until 5.1.0.