Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer

Conflicts:
	indra/llmessage/llurlrequest.cpp
	indra/newview/llvoavatar.cpp

indra/cmake/CMakeLists.txt

@@ -54,6 +54,7 @@ set(cmake_SOURCE_FILES
     LLMessage.cmake
     LLPlugin.cmake
     LLPrimitive.cmake
+    LLQtWebkit.cmake
     LLRender.cmake
     LLScene.cmake
     LLUI.cmake
@@ -70,6 +71,7 @@ set(cmake_SOURCE_FILES
     PNG.cmake
     Python.cmake
     Prebuilt.cmake
+    Qt4.cmake
     RunBuildTest.cmake
     TemplateCheck.cmake
     Tut.cmake

indra/cmake/LLQtWebkit.cmake

@@ -0,0 +1,11 @@
+# -*- cmake -*-
+
+if (STANDALONE)
+  set(LLQTWEBKIT_INCLUDE_DIR
+      ${LIBS_OPEN_DIR}/llqtwebkit
+      )
+
+  set(LLQTWEBKIT_LIBRARY
+      llqtwebkit
+      )
+endif (STANDALONE)

indra/cmake/Qt4.cmake

@@ -0,0 +1,12 @@
+# -*- cmake -*-
+include(Prebuilt)
+
+if (STANDALONE)
+  set(Qt4_FIND_REQUIRED ON)
+
+  include(FindQt4)
+
+  find_package(Qt4 4.7.0 COMPONENTS QtCore QtGui QtNetwork QtOpenGL QtWebKit REQUIRED)
+  include(${QT_USE_FILE})
+  add_definitions(${QT_DEFINITIONS})
+endif (STANDALONE)

indra/cmake/ViewerMiscLibs.cmake

@@ -19,8 +19,3 @@ else (NOT STANDALONE)
   endif(LINUX AND ${ARCH} STREQUAL "x86_64")
   set(STANDALONE ON)
 endif(NOT STANDALONE)
-
-if (WINDOWS)
-  use_prebuilt_binary(dbghelp)
-endif (WINDOWS)
-

indra/cmake/WebKitLibPlugin.cmake

@@ -1,19 +1,10 @@
 # -*- cmake -*-
 include(Linking)
 include(Prebuilt)
+include(LLQtWebkit)
+include(Qt4)
 
 if (STANDALONE)
-    # The minimal version, 4.4.3, is rather arbitrary: it's the version in Debian/Lenny.
-    find_package(Qt4 4.4.3 COMPONENTS QtCore QtGui QtNetwork QtOpenGL QtWebKit REQUIRED)
-    include(${QT_USE_FILE})
-    set(QTDIR $ENV{QTDIR})
-    if (QTDIR AND NOT "${QT_BINARY_DIR}" STREQUAL "${QTDIR}/bin")
-      message(FATAL_ERROR "\"${QT_BINARY_DIR}\" is unequal \"${QTDIR}/bin\"; "
-        "Qt is found by looking for qmake in your PATH. "
-        "Please set your PATH such that 'qmake' is found in \$QTDIR/bin, "
-        "or unset QTDIR if the found Qt is correct.")
-    endif (QTDIR AND NOT "${QT_BINARY_DIR}" STREQUAL "${QTDIR}/bin")
-    find_package(LLQtWebkit REQUIRED QUIET)
     set(WEBKITLIBPLUGIN OFF CACHE BOOL
         "WEBKITLIBPLUGIN support for the llplugin/llmedia test apps.")
 else (STANDALONE)
@@ -46,7 +37,7 @@ elseif (DARWIN)
         )
 elseif (LINUX)
      if (STANDALONE)
-       set(WEBKIT_PLUGIN_LIBRARIES ${LLQTWEBKIT_LIBRARY} ${QT_LIBRARIES})
+       set(WEBKIT_PLUGIN_LIBRARIES ${LLQTWEBKIT_LIBRARY} ${QT_LIBRARIES} ${QT_PLUGIN_LIBRARIES})
      else (STANDALONE)
        set(WEBKIT_PLUGIN_LIBRARIES
         llqtwebkit